mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-18 03:15:22 +00:00
- Familiars: ResearchItem added.
- Research page restructured
This commit is contained in:
1 parent
f1aeda7eac
commit
ebad7b7bd8
10 files changed
+140
-62
No files matched your search
@@ -2,7 +2,6 @@ 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;
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package makeo.gadomancy.common.familiar;
|
||||
|
||||
import makeo.gadomancy.common.familiar.ai.FamiliarAIProcess;
|
||||
import baubles.api.BaublesApi;
|
||||
import makeo.gadomancy.common.registration.RegisteredFamiliarAI;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
@@ -43,15 +44,16 @@ public class FamiliarAIController {
|
||||
this.availableTasks.add(RegisteredFamiliarAI.familiarAIZapAttackingMonsters);
|
||||
}
|
||||
|
||||
public void sheduleTick() {
|
||||
public void scheduleTick() {
|
||||
reduceRunningCooldowns();
|
||||
if(runningTask == null) {
|
||||
selectNewTask();
|
||||
} else {
|
||||
runningTask.tick(ticksInTask, owningPlayer.worldObj, owningPlayer);
|
||||
ItemStack famStack = BaublesApi.getBaubles(owningPlayer).getStackInSlot(0);
|
||||
runningTask.tick(ticksInTask, owningPlayer.worldObj, owningPlayer, famStack);
|
||||
ticksInTask++;
|
||||
if(ticksInTask >= runningTask.getDuration()) {
|
||||
if(runningTask.getCooldownDuration() > 0) cooldownProcesses.put(runningTask, runningTask.getCooldownDuration());
|
||||
if(runningTask.getCooldownDuration(famStack) > 0) cooldownProcesses.put(runningTask, runningTask.getCooldownDuration(famStack));
|
||||
if(runningTask.tryLoop() && !requestedLoop.contains(runningTask)) requestedLoop.addLast(runningTask);
|
||||
runningTask = null;
|
||||
ticksInTask = 0;
|
||||
@@ -76,7 +78,7 @@ public class FamiliarAIController {
|
||||
for (int i = 0; i < size; i++) {
|
||||
int index = (randIndex + i) % size;
|
||||
FamiliarAIProcess process = availableTasks.get(index);
|
||||
if(process.canRun(owningPlayer.worldObj, owningPlayer.posX, owningPlayer.posY, owningPlayer.posZ, owningPlayer) &&
|
||||
if(process.canRun(owningPlayer.worldObj, owningPlayer.posX, owningPlayer.posY, owningPlayer.posZ, owningPlayer, BaublesApi.getBaubles(owningPlayer).getStackInSlot(0)) &&
|
||||
!cooldownProcesses.containsKey(process)) {
|
||||
runningTask = process;
|
||||
}
|
||||
|
||||
+5
-4
@@ -1,6 +1,7 @@
|
||||
package makeo.gadomancy.common.familiar.ai;
|
||||
package makeo.gadomancy.common.familiar;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
@@ -22,11 +23,11 @@ public abstract class FamiliarAIProcess {
|
||||
this.id = sessionProcessIdCounter++;
|
||||
}
|
||||
|
||||
public abstract boolean canRun(World world, double x, double y, double z, EntityPlayer parent);
|
||||
public abstract boolean canRun(World world, double x, double y, double z, EntityPlayer parent, ItemStack itemStack);
|
||||
|
||||
public abstract void tick(int ticksSoFar, World worldObj, EntityPlayer owningPlayer);
|
||||
public abstract void tick(int ticksSoFar, World worldObj, EntityPlayer owningPlayer, ItemStack itemStack);
|
||||
|
||||
public abstract int getCooldownDuration();
|
||||
public abstract int getCooldownDuration(ItemStack itemStack);
|
||||
|
||||
public boolean tryLoop() {
|
||||
return false;
|
||||
@@ -4,7 +4,6 @@ import baubles.api.BaublesApi;
|
||||
import makeo.gadomancy.common.network.PacketHandler;
|
||||
import makeo.gadomancy.common.network.packets.PacketFamiliar;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -32,7 +31,7 @@ public class FamiliarHandlerServer {
|
||||
familiarAI = new HashMap<EntityPlayer, FamiliarAIController>();
|
||||
}
|
||||
|
||||
public void notifyEquip(World world, EntityPlayer player) {
|
||||
public void notifyEquip(World world, ItemStack itemStack, EntityPlayer player) {
|
||||
if(!world.isRemote) {
|
||||
if(!familiarAI.containsKey(player)) {
|
||||
FamiliarAIController controller = new FamiliarAIController(player);
|
||||
@@ -70,7 +69,7 @@ public class FamiliarHandlerServer {
|
||||
}
|
||||
}
|
||||
|
||||
public void equippedTick(World world, EntityPlayer player) {
|
||||
public void equippedTick(World world, ItemStack itemStack, EntityPlayer player) {
|
||||
if(!world.isRemote) {
|
||||
IInventory baublesInv = BaublesApi.getBaubles(player);
|
||||
if(baublesInv.getStackInSlot(0) == null) {
|
||||
@@ -79,10 +78,10 @@ public class FamiliarHandlerServer {
|
||||
}
|
||||
|
||||
if(familiarAI.get(player) == null || !activeFamiliars.contains(player.getCommandSenderName())) {
|
||||
notifyEquip(world, player);
|
||||
notifyEquip(world, itemStack, player);
|
||||
}
|
||||
|
||||
familiarAI.get(player).sheduleTick();
|
||||
familiarAI.get(player).scheduleTick();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ public class FamiliarHandlerServer {
|
||||
public void checkPlayerEquipment(EntityPlayer p) {
|
||||
IInventory baublesInv = BaublesApi.getBaubles(p);
|
||||
if(baublesInv.getStackInSlot(0) != null) {
|
||||
notifyEquip(p.worldObj, p);
|
||||
notifyEquip(p.worldObj, baublesInv.getStackInSlot(0), p);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,11 @@ import baubles.api.BaubleType;
|
||||
import baubles.api.IBauble;
|
||||
import makeo.gadomancy.common.Gadomancy;
|
||||
import makeo.gadomancy.common.registration.RegisteredItems;
|
||||
import makeo.gadomancy.common.utils.NBTHelper;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -26,6 +29,11 @@ public class ItemFamiliar extends Item implements IBauble {
|
||||
setCreativeTab(RegisteredItems.creativeTab);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumRarity getRarity(ItemStack p_77613_1_) {
|
||||
return RegisteredItems.raritySacred;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaubleType getBaubleType(ItemStack paramItemStack) {
|
||||
return BaubleType.AMULET;
|
||||
@@ -36,14 +44,14 @@ public class ItemFamiliar extends Item implements IBauble {
|
||||
@Override
|
||||
public void onWornTick(ItemStack itemStack, EntityLivingBase entity) {
|
||||
if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) {
|
||||
Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, (EntityPlayer) entity);
|
||||
Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEquipped(ItemStack itemStack, EntityLivingBase entity) {
|
||||
if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) {
|
||||
Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity);
|
||||
Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,4 +72,39 @@ public class ItemFamiliar extends Item implements IBauble {
|
||||
return true;
|
||||
}
|
||||
|
||||
//Infusion stuff.
|
||||
|
||||
public int getAttackRangeIncrease(ItemStack itemStack) {
|
||||
if(!(itemStack.getItem() instanceof ItemFamiliar)) return 0;
|
||||
|
||||
int attack = 0;
|
||||
|
||||
if(NBTHelper.getData(itemStack).getBoolean("RangeUpgrade1")) {
|
||||
attack += 3;
|
||||
}
|
||||
return attack;
|
||||
}
|
||||
|
||||
public int getAttackCooldownReduction(ItemStack itemStack) {
|
||||
if(!(itemStack.getItem() instanceof ItemFamiliar)) return 0;
|
||||
return NBTHelper.getData(itemStack).getBoolean("CdUpgrade1") ? 10 : 0;
|
||||
}
|
||||
|
||||
public float getAttackStrength(ItemStack itemStack) {
|
||||
if(!(itemStack.getItem() instanceof ItemFamiliar)) return 0F;
|
||||
|
||||
float attack = 1F;
|
||||
|
||||
if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade1")) {
|
||||
attack += 1F;
|
||||
}
|
||||
if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade2")) {
|
||||
attack += 2F;
|
||||
}
|
||||
if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade3")) {
|
||||
attack += 4F;
|
||||
}
|
||||
return attack;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,12 +2,14 @@ package makeo.gadomancy.common.registration;
|
||||
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import makeo.gadomancy.common.familiar.FamiliarAIController;
|
||||
import makeo.gadomancy.common.familiar.ai.FamiliarAIProcess;
|
||||
import makeo.gadomancy.common.familiar.FamiliarAIProcess;
|
||||
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
|
||||
import makeo.gadomancy.common.network.PacketHandler;
|
||||
import makeo.gadomancy.common.network.packets.PacketFamiliar;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.monster.IMob;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
@@ -28,15 +30,15 @@ public class RegisteredFamiliarAI {
|
||||
|
||||
public static FamiliarAIProcess familiarAIIdle = new FamiliarAIProcess(1) {
|
||||
@Override
|
||||
public boolean canRun(World world, double x, double y, double z, EntityPlayer parent) {
|
||||
public boolean canRun(World world, double x, double y, double z, EntityPlayer parent, ItemStack stackInSlot) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick(int ticksSoFar, World worldObj, EntityPlayer owningPlayer) {}
|
||||
public void tick(int ticksSoFar, World worldObj, EntityPlayer owningPlayer, ItemStack itemStack) {}
|
||||
|
||||
@Override
|
||||
public int getCooldownDuration() {
|
||||
public int getCooldownDuration(ItemStack itemStack) {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
@@ -44,13 +46,16 @@ public class RegisteredFamiliarAI {
|
||||
public static FamiliarAIProcess familiarAIZapAttackingMonsters = new FamiliarAIProcess(1) {
|
||||
|
||||
@Override
|
||||
public boolean canRun(World world, double x, double y, double z, EntityPlayer parent) {
|
||||
return getPotentialTargets(world, parent).size() > 0;
|
||||
public boolean canRun(World world, double x, double y, double z, EntityPlayer parent, ItemStack itemStack) {
|
||||
int rangeInc = ((ItemFamiliar) itemStack.getItem()).getAttackRangeIncrease(itemStack);
|
||||
return getPotentialTargets(world, parent, rangeInc).size() > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick(int ticksSoFar, World world, EntityPlayer parent) {
|
||||
List<EntityLivingBase> lastTargetters = getPotentialTargets(world, parent);
|
||||
public void tick(int ticksSoFar, World world, EntityPlayer parent, ItemStack itemStack) {
|
||||
int rangeInc = ((ItemFamiliar) itemStack.getItem()).getAttackRangeIncrease(itemStack);
|
||||
|
||||
List<EntityLivingBase> lastTargetters = getPotentialTargets(world, parent, rangeInc);
|
||||
if(lastTargetters.size() < 1) {
|
||||
FamiliarAIController.cleanTargetterList(parent);
|
||||
return;
|
||||
@@ -61,7 +66,7 @@ public class RegisteredFamiliarAI {
|
||||
return;
|
||||
}
|
||||
|
||||
mob.attackEntityFrom(DamageSource.magic, 6);
|
||||
mob.attackEntityFrom(DamageSource.magic, ((ItemFamiliar) itemStack.getItem()).getAttackStrength(itemStack));
|
||||
|
||||
world.playSoundEffect(mob.posX + 0.5, mob.posY + 0.5, mob.posZ + 0.5, "thaumcraft:zap", 0.8F, 1.0F);
|
||||
|
||||
@@ -70,9 +75,10 @@ public class RegisteredFamiliarAI {
|
||||
FamiliarAIController.cleanTargetterList(parent);
|
||||
}
|
||||
|
||||
private List<EntityLivingBase> getPotentialTargets(World world, EntityPlayer player) {
|
||||
List<EntityLivingBase> validTargets = getCloseEnoughTargetters(world, player);
|
||||
List mobs = world.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - 0.5, player.posY - 0.5, player.posZ - 0.5, player.posX + 0.5, player.posY + 0.5, player.posZ + 0.5).expand(5, 5, 5));
|
||||
private List<EntityLivingBase> getPotentialTargets(World world, EntityPlayer player, int rangeInc) {
|
||||
List<EntityLivingBase> validTargets = getCloseEnoughTargetters(world, player, rangeInc);
|
||||
int range = 5 + rangeInc;
|
||||
List mobs = world.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - 0.5, player.posY - 0.5, player.posZ - 0.5, player.posX + 0.5, player.posY + 0.5, player.posZ + 0.5).expand(range, range, range));
|
||||
for(Object mobObj : mobs) {
|
||||
if(!(mobObj instanceof EntityLivingBase)) continue;
|
||||
EntityLivingBase mob = (EntityLivingBase) mobObj;
|
||||
@@ -82,11 +88,12 @@ public class RegisteredFamiliarAI {
|
||||
return validTargets;
|
||||
}
|
||||
|
||||
private List<EntityLivingBase> getCloseEnoughTargetters(World world, EntityPlayer parent) {
|
||||
private List<EntityLivingBase> getCloseEnoughTargetters(World world, EntityPlayer parent, int rangeInc) {
|
||||
LinkedList<EntityLivingBase> lastTargetters = FamiliarAIController.getLastTargetters(parent);
|
||||
if(lastTargetters == null || lastTargetters.isEmpty()) return new ArrayList<EntityLivingBase>();
|
||||
List<EntityLivingBase> closeEnoughLastTargetters = new ArrayList<EntityLivingBase>();
|
||||
List livingAround = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(parent.posX - 0.5, parent.posY - 0.5, parent.posZ - 0.5, parent.posX + 0.5, parent.posY + 0.5, parent.posZ + 0.5).expand(8, 8, 8));
|
||||
int range = 8 + rangeInc;
|
||||
List livingAround = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(parent.posX - 0.5, parent.posY - 0.5, parent.posZ - 0.5, parent.posX + 0.5, parent.posY + 0.5, parent.posZ + 0.5).expand(range, range, range));
|
||||
for(Object living : livingAround) {
|
||||
if(!(living instanceof EntityLivingBase)) continue;
|
||||
if(lastTargetters.contains(living)) closeEnoughLastTargetters.add((EntityLivingBase) living);
|
||||
@@ -100,8 +107,8 @@ public class RegisteredFamiliarAI {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCooldownDuration() {
|
||||
return 20;
|
||||
public int getCooldownDuration(ItemStack itemStack) {
|
||||
return 20 - ((ItemFamiliar) itemStack.getItem()).getAttackCooldownReduction(itemStack);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -5,8 +5,11 @@ import makeo.gadomancy.common.Gadomancy;
|
||||
import makeo.gadomancy.common.items.*;
|
||||
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
@@ -28,6 +31,8 @@ import java.util.List;
|
||||
public class RegisteredItems {
|
||||
private RegisteredItems() {}
|
||||
|
||||
public static EnumRarity raritySacred = EnumHelper.addRarity("Sacred", EnumChatFormatting.GOLD, "Sacred");
|
||||
|
||||
public static CreativeTabs creativeTab;
|
||||
|
||||
public static Item itemFakeModIcon;
|
||||
|
||||
@@ -144,7 +144,7 @@ public class RegisteredRecipes {
|
||||
NBTTagCompound compound = NBTHelper.getData(result);
|
||||
compound.setString("aspect", aspect.getName());
|
||||
|
||||
recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("STICKYJAR"), 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), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14) });
|
||||
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) });
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ import thaumcraft.api.research.ResearchCategories;
|
||||
import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchPage;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
|
||||
/**
|
||||
* This class is part of the Gadomancy Mod
|
||||
@@ -46,70 +45,78 @@ public class RegisteredResearches {
|
||||
public static ResearchItem researchGrowingNodeAttackNodes;
|
||||
public static ResearchItem researchGrowingNodeGrowthClue;
|
||||
|
||||
//Familiar
|
||||
public static ResearchItem researchFamiliarBasic;
|
||||
|
||||
public static void init() {
|
||||
|
||||
ResearchCategories.registerCategory(Gadomancy.MODID, CATEGORY_ICON, CATEGORY_BACKGROUND);
|
||||
|
||||
ResearchItem researchAdvancedGolem = PseudoResearchItem.create("ADVANCEDGOLEM", 2, -2).registerResearchItem();
|
||||
ResearchItem researchAdvancedGolem = PseudoResearchItem.create("ADVANCEDGOLEM", 0, -5).registerResearchItem();
|
||||
|
||||
researchGolemSilverwood = new SimpleResearchItem("GOLEMSILVERWOOD", 4, -3, 3, (ItemStack) RegisteredRecipes.recipeGolemSilverwood.getRecipeOutput(),
|
||||
researchGolemSilverwood = new SimpleResearchItem("GOLEMSILVERWOOD", 1, -2, 3, (ItemStack) RegisteredRecipes.recipeGolemSilverwood.getRecipeOutput(),
|
||||
new AspectList().add(Aspect.MOTION, 10).add(Aspect.TREE, 10).add(Aspect.MAGIC, 8).add(Aspect.ORDER, 8).add(Aspect.FLESH, 6).add(Aspect.EXCHANGE, 5))
|
||||
.setParents(researchAdvancedGolem.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GOLEMSILVERWOOD.1"), new ResearchPage(RegisteredRecipes.recipeGolemSilverwood)).registerResearchItem();
|
||||
|
||||
researchGolemRunicShield = new SimpleResearchItem("GOLEMRUNICSHIELD", 6, -4, 4, new ItemStack(RegisteredItems.itemFakeGolemShield, 1, 32767),
|
||||
researchGolemRunicShield = new SimpleResearchItem("GOLEMRUNICSHIELD", 0, 0, 4, new ItemStack(RegisteredItems.itemFakeGolemShield, 1, 32767),
|
||||
new AspectList().add(Aspect.AURA, 16))
|
||||
.setParents(researchGolemSilverwood.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GOLEMRUNICSHIELD.1"), new ResearchPage(RegisteredRecipes.recipesGolemRunicShield)).registerResearchItem();
|
||||
|
||||
ResearchItem researchDistill = PseudoResearchItem.create("DISTILESSENTIA", -2, -1).registerResearchItem();
|
||||
ResearchItem researchDistill = PseudoResearchItem.create("DISTILESSENTIA", -2, -5).registerResearchItem();
|
||||
|
||||
researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -1, 2, new ItemStack(RegisteredBlocks.blockArcaneDropper),
|
||||
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()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.ARCANEDROPPER.1"), new ResearchPage(RegisteredRecipes.recipeArcaneDropper)).registerResearchItem();
|
||||
|
||||
ResearchItem researchCoreGather = PseudoResearchItem.create("COREGATHER", 3, 0).registerResearchItem();
|
||||
ResearchItem researchHarvestGather = PseudoResearchItem.create("COREHARVEST", 3, -6).registerResearchItem();
|
||||
ResearchItem researchEleToolAxe = PseudoResearchItem.create("ELEMENTALAXE", 4, -8).registerResearchItem();
|
||||
ResearchItem researchEleToolPick = PseudoResearchItem.create("ELEMENTALPICK", 5, -7).registerResearchItem();
|
||||
ResearchItem researchEleToolShovel = PseudoResearchItem.create("ELEMENTALSHOVEL", 6, -6).registerResearchItem();
|
||||
|
||||
researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 5, -1, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak),
|
||||
researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 5, -4, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak),
|
||||
new AspectList().add(Aspect.TOOL, 8).add(Aspect.ENTROPY, 8).add(Aspect.MECHANISM, 8))
|
||||
.setParents(researchCoreGather.key).setConcealed()
|
||||
.setParents(researchHarvestGather.key, researchEleToolAxe.key, researchEleToolPick.key, researchEleToolShovel.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBREAK.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBreak)).registerResearchItem();
|
||||
|
||||
ResearchItem researchFocusPrimal = PseudoResearchItem.create("FOCUSPRIMAL", -2, -3).registerResearchItem();
|
||||
ResearchItem researchFocusPrimal = PseudoResearchItem.create("FOCUSPRIMAL", -7, -10).registerResearchItem();
|
||||
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 researchCoreUse = PseudoResearchItem.create("COREUSE", -5, -9).registerResearchItem();
|
||||
|
||||
ResearchItem researchItemVoidMetal = PseudoResearchItem.create("VOIDMETAL", -3, 4).registerResearchItem();
|
||||
ResearchItem researchNodeStabilizer = PseudoResearchItem.create("NODESTABILIZER", -3, 6).registerResearchItem();
|
||||
ResearchItem researchWardingStone = PseudoResearchItem.create("PAVEWARD", -1, 6).registerResearchItem();
|
||||
|
||||
researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -1, -3, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw),
|
||||
researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -6, -7, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw),
|
||||
new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.MECHANISM, 8).add(Aspect.MAGIC, 8).add(Aspect.ORDER, 8).add(Aspect.DARKNESS, 4))
|
||||
.setParents(researchFocusPrimal.key).setConcealed()
|
||||
.setParents(researchFocusPrimal.key, researchItemVoidMetal.key, researchWandPedestal.key, researchCoreUse.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.INFUSIONCLAW.1"), new ResearchPage(RegisteredRecipes.recipeInfusionClaw)).registerResearchItem();
|
||||
|
||||
|
||||
researchNodeManipulator = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", Gadomancy.MODID,
|
||||
new AspectList().add(Aspect.ELDRITCH, 1).add(Aspect.AURA, 1).add(Aspect.DARKNESS, 1).add(Aspect.MAGIC, 1).add(Aspect.GREED, 1).add(Aspect.VOID, 1).add(Aspect.MECHANISM, 1).add(Aspect.EXCHANGE, 1),
|
||||
-1, 4, 2, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5))
|
||||
new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.AURA, 6).add(Aspect.DARKNESS, 4).add(Aspect.MAGIC, 8).add(Aspect.GREED, 4).add(Aspect.VOID, 10).add(Aspect.MECHANISM, 6).add(Aspect.EXCHANGE, 4),
|
||||
-9, -4, 2, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5))
|
||||
.setConcealed().setSpecial()
|
||||
.setParents(researchItemVoidMetal.key, researchNodeStabilizer.key, researchWardingStone.key)
|
||||
.setParents(researchItemVoidMetal.key, researchNodeStabilizer.key, researchWardingStone.key, researchWandPedestal.key)
|
||||
.setPages(new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.1"), new ResearchPage(RegisteredRecipes.recipeNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.3"), new ResearchPage(RegisteredRecipes.recipeRandomizationFocus), new ResearchPage(RegisteredRecipes.multiblockNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.6")).registerResearchItem();
|
||||
|
||||
researchGrowingNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING", Gadomancy.MODID, new AspectList(), 2, 2, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"))
|
||||
researchGrowingNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING", Gadomancy.MODID, new AspectList(), -8, -1, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"))
|
||||
.setSpecial().setLost().setConcealed()
|
||||
.setParents(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR")
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GROWING.1"), new ResearchPage("gadomancy.research_page.GROWING.2")).registerResearchItem();
|
||||
|
||||
researchGrowingNodeAgression = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID, new AspectList(), 5, 3, 6, new ItemStack(ConfigBlocks.blockAiry, 1, 5))
|
||||
researchGrowingNodeAgression = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID, new AspectList(), -5, 0, 6, new ItemStack(ConfigBlocks.blockAiry, 1, 5))
|
||||
.setLost()
|
||||
.setParents(Gadomancy.MODID.toUpperCase() + ".GROWING")
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GROWING_AGGRESSION.1")).registerResearchItem();
|
||||
|
||||
researchGrowingNodeGrowth = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", Gadomancy.MODID, new AspectList(), 3, 5, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_star.png"))
|
||||
researchGrowingNodeGrowth = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", Gadomancy.MODID, new AspectList(), -7, 2, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_star.png"))
|
||||
.setLost()
|
||||
.setParents(Gadomancy.MODID.toUpperCase() + ".GROWING")
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTH.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTH.2")).registerResearchItem();
|
||||
|
||||
researchGrowingNodeAttackNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK", Gadomancy.MODID, new AspectList(), 4, 4, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_dark.png"))
|
||||
researchGrowingNodeAttackNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK", Gadomancy.MODID, new AspectList(), -6, 1, 6, new ResourceLocation("gadomancy", "textures/misc/r_node_dark.png"))
|
||||
.setLost()
|
||||
.setParents(Gadomancy.MODID.toUpperCase() + ".GROWING")
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GROWING_ATTACK.1")).registerResearchItem();
|
||||
@@ -117,25 +124,35 @@ public class RegisteredResearches {
|
||||
researchGrowingNodeGrowthClue = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", Gadomancy.MODID,
|
||||
new AspectList().add(Aspect.AURA, 10).add(Aspect.MAGIC, 15).add(Aspect.ELDRITCH, 5).add(Aspect.VOID, 12).add(Aspect.ENERGY, 12).add(Aspect.ENTROPY, 8).add(Aspect.DEATH, 3)
|
||||
.add(Aspect.GREED, 10).add(Aspect.HUNGER, 10).add(Aspect.MECHANISM, 12).add(Aspect.DARKNESS, 12),
|
||||
6, 6, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 5))
|
||||
-4, 3, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 5))
|
||||
.setSpecial().setRound().setConcealed()
|
||||
.setParents(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK")
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.2")).registerResearchItem();
|
||||
|
||||
ResearchItem nitorResearch = PseudoResearchItem.create("NITOR", 2, -4).registerResearchItem();
|
||||
|
||||
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))
|
||||
.setSpecial().setConcealed()
|
||||
.setParents(nitorResearch.key)
|
||||
.setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar)).registerResearchItem();
|
||||
|
||||
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", 4);
|
||||
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3);
|
||||
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", 1);
|
||||
}
|
||||
|
||||
public static void postInit() {
|
||||
ResearchItem researchVoidJar = PseudoResearchItem.create("JARVOID", -2, 1).registerResearchItem();
|
||||
ResearchItem researchVoidJar = PseudoResearchItem.create("JARVOID", -3, -7).registerResearchItem();
|
||||
|
||||
researchStickyJar = new AlternatingResearchItem("STICKYJAR", -1, 1, 2,
|
||||
researchStickyJar = new AlternatingResearchItem("STICKYJAR", -5, -5, 2,
|
||||
new AspectList().add(Aspect.SLIME, 8).add(Aspect.EARTH, 8),
|
||||
RegisteredItems.getStickyJarStacks())
|
||||
.setParents(researchVoidJar.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.STICKYJAR.1"), new ResearchPage(RegisteredRecipes.getVisualStickyJarRecipes())).registerResearchItem();
|
||||
|
||||
researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -2, 2, 3,
|
||||
researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -4, -3, 3,
|
||||
RegisteredRecipes.recipeRemoteJar.getRecipeOutput(),
|
||||
new AspectList().add(Aspect.WATER, 4).add(Aspect.MECHANISM, 8).add(Aspect.EARTH, 4).add(Aspect.ORDER, 8))
|
||||
.setParents(researchVoidJar.key).setConcealed()
|
||||
|
||||
Reference in new issue
Block a user