diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 853e82c..a2c3056 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -145,7 +145,7 @@ public class ClientProxy extends CommonProxy { itemRenderStoneMachine.registerRenderer(2, tileBlockProtector, renderTileBlockProtector); itemRenderStoneMachine.registerRenderer(4, new TileArcanePackager(), renderTileArcanePackager); - MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemFamiliar_old, new ItemRenderFamiliar()); + MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemEtherealFamiliar, new ItemRenderFamiliar()); MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemCreativeNode, new ItemCreativeNodeRenderer()); //Entities 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 716c16f..8fd7087 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -1,7 +1,7 @@ package makeo.gadomancy.client.renderers.item; import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import makeo.gadomancy.common.utils.world.fake.FakeWorld; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.entity.RenderManager; @@ -22,12 +22,12 @@ import thaumcraft.common.entities.monster.EntityWisp; public class ItemRenderFamiliar implements IItemRenderer { private static final RenderWisp fallbackRenderer; - private static final EntityWisp ENTITY_WISP; + private static EntityWisp ENTITY_WISP = null; private float[] renderInfo = new float[5]; @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return !(item == null || !(item.getItem() instanceof ItemFamiliar_Old)); + return !(item == null || !(item.getItem() instanceof ItemEtherealFamiliar)); } @Override @@ -38,12 +38,11 @@ public class ItemRenderFamiliar implements IItemRenderer { static { fallbackRenderer = new RenderWisp(); fallbackRenderer.setRenderManager(RenderManager.instance); - ENTITY_WISP = new EntityWisp(new FakeWorld()); } @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(item == null || !(item.getItem() instanceof ItemFamiliar_Old)) return; + if(item == null || !(item.getItem() instanceof ItemEtherealFamiliar)) return; GL11.glPushMatrix(); if(type == ItemRenderType.EQUIPPED) { GL11.glTranslatef(0.5F, 0.5F, 0.7F); @@ -56,9 +55,10 @@ public class ItemRenderFamiliar implements IItemRenderer { try { cleanActiveRenderInfo(type); GL11.glScalef(1.2F, 1.2F, 1.2F); - if(((ItemFamiliar_Old) item.getItem()).hasAspect(item)) { + if(ItemEtherealFamiliar.hasFamiliarAspect(item)) { + if(ENTITY_WISP == null) ENTITY_WISP = new EntityWisp(new FakeWorld()); ENTITY_WISP.ticksExisted = FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.ticksExisted; - ENTITY_WISP.setType(((ItemFamiliar_Old) item.getItem()).getAspect(item).getTag()); + ENTITY_WISP.setType(ItemEtherealFamiliar.getFamiliarAspect(item).getTag()); fallbackRenderer.doRender(ENTITY_WISP, 0, 0, 0, 0, 0); } } finally { diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java index c2219e1..246848c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java @@ -225,7 +225,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Special to inputTile only! private void handleIO() { - if ((!worldObj.isRemote) && ((ticksExisted & 15) == 0) && (getEssentiaAmount() < getMaxAmount())) { + if ((!worldObj.isRemote) && ((ticksExisted % 40) == 0) && (getEssentiaAmount() < getMaxAmount())) { TileEntity te = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.DOWN); if (te != null) { IEssentiaTransport ic = (IEssentiaTransport) te; diff --git a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java index bcc109d..672168c 100644 --- a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java @@ -30,8 +30,7 @@ import java.util.Map; public class DataFamiliar extends AbstractData { private List playersWithFamiliar = new ArrayList(); - private Map familiarAI = new HashMap(); - //private Map familiarControllers = new HashMap(); + private Map familiarControllers = new HashMap(); private List addClientQueue = new ArrayList(); private List removeClientQueue = new ArrayList(); @@ -53,15 +52,10 @@ public class DataFamiliar extends AbstractData { if(!playersWithFamiliar.contains(data)) playersWithFamiliar.add(data); markDirty(); - if(!familiarAI.containsKey(player)) { - FamiliarAIController_Old controller = new FamiliarAIController_Old(player); - controller.registerDefaultTasks(); - familiarAI.put(player, controller); - } - /*if(!familiarControllers.containsKey(player)) { + if(!familiarControllers.containsKey(player)) { FamiliarController controller = new FamiliarController(player); familiarControllers.put(player, controller); - }*/ + } } public void handleUnequip(World world, EntityPlayer player, Aspect aspect) { @@ -74,7 +68,7 @@ public class DataFamiliar extends AbstractData { if(playersWithFamiliar.contains(data)) playersWithFamiliar.remove(data); markDirty(); - familiarAI.remove(player); + familiarControllers.remove(player); } public void equipTick(World world, EntityPlayer player, Aspect aspect) { @@ -88,25 +82,17 @@ public class DataFamiliar extends AbstractData { return; } - if(familiarAI.get(player) == null || !playersWithFamiliar.contains(data)) { + if(familiarControllers.get(player) == null || !playersWithFamiliar.contains(data)) { handleEquip(world, player, aspect); } - familiarAI.get(player).scheduleTick(); + familiarControllers.get(player).tick(); } - //TODO adjust to new itemClass! public void checkPlayerEquipment(EntityPlayer p) { IInventory baublesInv = BaublesApi.getBaubles(p); if(baublesInv.getStackInSlot(0) != null) { ItemStack amulet = baublesInv.getStackInSlot(0); - if(amulet.getItem() != null && amulet.getItem() instanceof ItemFamiliar_Old) { - ItemFamiliar_Old fam = (ItemFamiliar_Old) amulet.getItem(); - Aspect a = fam.getAspect(amulet); - if(a != null) { - handleEquip(p.worldObj, p, a); - } - } if(amulet.getItem() != null && amulet.getItem() instanceof ItemEtherealFamiliar) { Aspect a = ItemEtherealFamiliar.getFamiliarAspect(amulet); if(a != null) { diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java index debd7cd..6625f14 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java @@ -166,9 +166,9 @@ public class FamiliarController { } if (augment.equals(FamiliarAugment.SHOCK)) { for (EntityLivingBase entity : toAttack) { - if (RAND.nextInt(3) == 0) { + if (RAND.nextBoolean()) { Vector3 vel = MiscUtils.getPositionVector(entity).subtract(MiscUtils.getPositionVector(owningPlayer)) - .normalize().divide(2).multiply(0.5 * effectLevel); + .normalize().divide(2).multiply(0.8 * effectLevel); if (vel.getY() < 0) vel.setY(-vel.getY()); entity.motionX += vel.getX(); entity.motionY += vel.getY(); diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java index f420cbb..e40b5cb 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java @@ -44,21 +44,12 @@ public class ItemFamiliar_Old extends Item implements IBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - ItemStack stack = new ItemStack(item); - setAspect(stack, Aspect.MAGIC); - list.add(stack); - - stack = new ItemStack(item); - setAspect(stack, Aspect.MAGIC); - for(FamiliarUpgrade upgrade : FamiliarUpgrade.values()) { - addUpgrade(stack, upgrade); - } - list.add(stack); - } + public void getSubItems(Item item, CreativeTabs tab, List list) {} @Override public void addInformation(ItemStack stack, EntityPlayer player, List lore, boolean flag) { + lore.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("gadomancy.lore.deprecation.back")); + if(stack.hasTagCompound()) { if(hasAspect(stack)) { lore.add(getAspect(stack).getName()); @@ -98,7 +89,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { @Override public EnumRarity getRarity(ItemStack stack) { - return RegisteredItems.raritySacred; + return EnumRarity.common; } @Override @@ -125,7 +116,7 @@ public class ItemFamiliar_Old extends Item implements IBauble { } @Override - public void onWornTick(ItemStack itemStack, EntityLivingBase entity) { + public void onWornTick(ItemStack itemStack, EntityLivingBase entity) {/* if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar_Old) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); @@ -145,11 +136,11 @@ public class ItemFamiliar_Old extends Item implements IBauble { Thaumcraft.addWarpToPlayer((EntityPlayer) entity, 1 + itemRand.nextInt(4), true); } } - } + }*/ } @Override - public void onEquipped(ItemStack itemStack, EntityLivingBase entity) { + public void onEquipped(ItemStack itemStack, EntityLivingBase entity) {/* if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar_Old) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); @@ -157,11 +148,11 @@ public class ItemFamiliar_Old extends Item implements IBauble { if(a != null) { familiarData.handleEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a); } - } + }*/ } @Override - public void onUnequipped(ItemStack itemStack, EntityLivingBase entity) { + public void onUnequipped(ItemStack itemStack, EntityLivingBase entity) {/* if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar_Old) { DataFamiliar familiarData = SyncDataHolder.getDataServer("FamiliarData"); @@ -169,12 +160,12 @@ public class ItemFamiliar_Old extends Item implements IBauble { if(a != null) { familiarData.handleUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity, a); } - } + }*/ } @Override public boolean canEquip(ItemStack itemStack, EntityLivingBase entity) { - return true; + return false; } @Override diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index d252913..fe157cd 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -51,7 +51,7 @@ public class RegisteredItems { public static ItemGolemCoreBreak itemGolemCoreBreak; public static ItemExtendedNodeJar itemExtendedNodeJar; public static ItemFamiliar_Old itemFamiliar_old; - //public static ItemEtherealFamiliar itemEtherealFamiliar; + public static ItemEtherealFamiliar itemEtherealFamiliar; public static ItemCreativeNode itemCreativeNode; public static ItemArcanePackage itemPackage; public static ItemFakeLootbag itemFakeLootbag; @@ -81,7 +81,7 @@ public class RegisteredItems { itemTransformationFocus = registerItem(new ItemTransformationFocus()); itemGolemCoreBreak = registerItem(new ItemGolemCoreBreak()); itemFamiliar_old = registerItem(new ItemFamiliar_Old(), "ItemFamiliar"); - //itemEtherealFamiliar = registerItem(new ItemEtherealFamiliar()); + itemEtherealFamiliar = registerItem(new ItemEtherealFamiliar()); itemAuraCore = registerItem(new ItemAuraCore()); itemCreativeNode = registerItem(new ItemCreativeNode()); diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index b56a873..b6bd11e 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.crafting.FamiliarAugmentInfusion; +import makeo.gadomancy.common.crafting.FamiliarUndoRecipe; import makeo.gadomancy.common.crafting.InfusionDisguiseArmor; import makeo.gadomancy.common.crafting.InfusionUpgradeRecipe; import makeo.gadomancy.common.crafting.RecipeStickyJar; @@ -234,7 +235,7 @@ public class RegisteredRecipes { recipeRevealer = ThaumcraftApi.addInfusionEnchantmentRecipe("", RegisteredEnchantments.revealer, 4, new AspectList().add(Aspect.SENSES, 16).add(Aspect.MAGIC, 8), new ItemStack[]{new ItemStack(ConfigItems.itemGoggles), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14)}); - //CraftingManager.getInstance().getRecipeList().add(new FamiliarUndoRecipe()); + CraftingManager.getInstance().getRecipeList().add(new FamiliarUndoRecipe()); } private static List[] createAuraCoreRecipes() { diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index d855eb2..5edea80 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -72,22 +72,22 @@ public class RegisteredResearches { public static ResearchItem researchGrowingNodeGrowthClue; //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 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() { ResearchCategories.registerCategory(Gadomancy.MODID, CATEGORY_ICON, CATEGORY_BACKGROUND); - ResearchItem researchAdvancedGolem = PseudoResearchItem.create("GOLEMTALLOW", 0, -5).registerResearchItem(); + ResearchItem researchTallowGolem = PseudoResearchItem.create("GOLEMTALLOW", 0, -5).registerResearchItem(); 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() + .setParents(researchTallowGolem.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMSILVERWOOD.1"), new ResearchPage(RegisteredRecipes.recipeGolemSilverwood)).registerResearchItem(); researchGolemRunicShield = new SimpleResearchItem("GOLEMRUNICSHIELD", 0, 0, 4, new ItemStack(RegisteredItems.itemFakeGolemShield, 1, 32767), @@ -95,51 +95,51 @@ public class RegisteredResearches { .setParents(researchGolemSilverwood.key).setConcealed() .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(); + ResearchItem researchBellows = PseudoResearchItem.create("BELLOWS", -2, -5).registerResearchItem(); - researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -2, 2, new ItemStack(RegisteredBlocks.blockArcaneDropper), + researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -3, 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, researchBellows.key).setConcealed() + .setParents("DISTILESSENTIA", researchBellows.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.ARCANEDROPPER.1"), new ResearchPage(RegisteredRecipes.recipeArcaneDropper)).registerResearchItem(); - ResearchItem researchHarvestGather = PseudoResearchItem.create("COREHARVEST", 3, -8).registerResearchItem(); - ResearchItem researchEleToolAxe = PseudoResearchItem.create("ELEMENTALAXE", 4, -10).registerResearchItem(); - ResearchItem researchEleToolPick = PseudoResearchItem.create("ELEMENTALPICK", 5, -9).registerResearchItem(); - ResearchItem researchEleToolShovel = PseudoResearchItem.create("ELEMENTALSHOVEL", 6, -8).registerResearchItem(); - ResearchItem researchEleSword = PseudoResearchItem.create("ELEMENTALSWORD", 7, -7).registerResearchItem(); - ResearchItem researchCoreGuard = PseudoResearchItem.create("COREGUARD", 8, -6).registerResearchItem(); + ResearchItem researchHarvestGather = PseudoResearchItem.create("COREHARVEST", 2, -6).registerResearchItem(); + ResearchItem researchCoreGuard = PseudoResearchItem.create("COREGUARD", 4, -5).registerResearchItem(); - researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 5, -6, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak), + ResearchItem researchVEleToolAxe = new ResearchItem("ELEMENTALAXE", Gadomancy.MODID).registerResearchItem(); + ResearchItem researchVEleToolPick = new ResearchItem("ELEMENTALPICK", Gadomancy.MODID).registerResearchItem(); + ResearchItem researchVEleToolShovel = new ResearchItem("ELEMENTALSHOVEL", Gadomancy.MODID).registerResearchItem(); + ResearchItem researchVEleSword = new ResearchItem("ELEMENTALSWORD", Gadomancy.MODID).registerResearchItem(); + + researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 3, -3, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ENTROPY, 8).add(Aspect.MECHANISM, 8)) - .setParents(researchHarvestGather.key, researchEleToolAxe.key, researchEleToolPick.key, researchEleToolShovel.key).setConcealed() + .setParents(researchHarvestGather.key, researchVEleToolAxe.key, researchVEleToolPick.key, researchVEleToolShovel.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBREAK.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBreak)).registerResearchItem(); - ResearchItem researchBootsTraveller = PseudoResearchItem.create("BOOTSTRAVELLER", 5, -3).registerResearchItem(); + ResearchItem researchVBootsTraveller = new ResearchItem("BOOTSTRAVELLER", Gadomancy.MODID).registerResearchItem(); - researchGolemCoreBodyguard = new SimpleResearchItem("GOLEMCOREBODYGUARD", 6, -5, 2, new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), + researchGolemCoreBodyguard = new SimpleResearchItem("GOLEMCOREBODYGUARD", 5, -3, 2, new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ORDER, 8).add(Aspect.MECHANISM, 10).add(Aspect.ARMOR, 8).add(Aspect.WEAPON, 8)) - .setParents(researchBootsTraveller.key, researchEleSword.key, researchCoreGuard.key).setConcealed() + .setParents(researchVBootsTraveller.key, researchVEleSword.key, researchCoreGuard.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBODYGUARD.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBodyguard)).registerResearchItem(); - ResearchItem researchFocusPrimal = PseudoResearchItem.create("FOCUSPRIMAL", -7, -10).registerResearchItem(); + ResearchItem researchVFocusPrimal = new ResearchItem("FOCUSPRIMAL", Gadomancy.MODID).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("WANDPEDFOC", -12, -5).registerResearchItem(); - ResearchItem researchCoreUse = PseudoResearchItem.create("COREUSE", -5, -9).registerResearchItem(); + ResearchItem researchVWardingStone = new ResearchItem("PAVEWARD", Gadomancy.MODID).registerResearchItem(); + ResearchItem researchVNodeStabilizer = new ResearchItem("WANDPEDFOC", Gadomancy.MODID).registerResearchItem(); + ResearchItem researchVCoreUse = new ResearchItem("COREUSE", Gadomancy.MODID).registerResearchItem(); ResearchItem researchOculus = PseudoResearchItem.create("OCULUS", -11, -2).setRound().setSpecial().registerResearchItem(); 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, researchItemVoidMetal.key, researchWandPedestal.key, researchCoreUse.key).setConcealed() + .setParents(researchVFocusPrimal.key, researchItemVoidMetal.key, researchWandPedestal.key, researchVCoreUse.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.INFUSIONCLAW.1"), new ResearchPage(RegisteredRecipes.recipeInfusionClaw), new ResearchPage("gadomancy.research_page.INFUSIONCLAW.2")).registerResearchItem(); researchNodeManipulator = new SimpleResearchItem("NODE_MANIPULATOR", -9, -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)) .setConcealed().setSpecial() - .setParents(researchItemVoidMetal.key, researchNodeStabilizer.key, researchWardingStone.key, researchWandPedestal.key) + .setParents(researchItemVoidMetal.key, researchVNodeStabilizer.key, researchVWardingStone.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(); researchEldritchPortalCreator = new SimpleResearchItem("E_PORTAL_CREATOR", -10, 0, 2, new ItemStack(RegisteredBlocks.blockAdditionalEldrichPortal, 1, 0), @@ -148,7 +148,7 @@ public class RegisteredResearches { .setParents(researchNodeManipulator.key, researchOculus.key) .setPages(new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.1"), new ResearchPage(RegisteredRecipes.recipeAncientPedestal), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.3"), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.4"), new ResearchPage(RegisteredRecipes.recipePortalFocus), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.6"), new ResearchPage(RegisteredRecipes.multiblockEldritchPortalCreator), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.8")).registerResearchItem(); - researchBlockProtector = new SimpleResearchItem("BLOCK_PROTECTOR", 0, -8, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + researchBlockProtector = new SimpleResearchItem("BLOCK_PROTECTOR", -6, -2, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), new AspectList().add(Aspect.ORDER, 10).add(Aspect.ARMOR, 8).add(Aspect.EARTH, 12).add(Aspect.LIGHT, 10).add(Aspect.AURA, 8)) .setConcealed() .setPages(new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.1"), new ResearchPage(RegisteredRecipes.recipeBlockProtector), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.3"), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.4")).registerResearchItem(); @@ -183,64 +183,6 @@ public class RegisteredResearches { } - ResearchItem nitorResearch = PseudoResearchItem.create("NITOR", 2, -4).registerResearchItem(); - ResearchItem runicResearch = PseudoResearchItem.create("RUNICARMOR", 4, -4).registerResearchItem(); - - ItemStack familiarResearchStack = new ItemStack(RegisteredItems.itemFamiliar_old, 1, 0); - NBTHelper.getData(familiarResearchStack).setString("aspect", Aspect.MAGIC.getTag()); - - researchFamiliarBasic = new SimpleResearchItem("FAMILIAR", - 3, -2, 2, familiarResearchStack, - 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)) - .setSpecial().setConcealed() - .setParents(nitorResearch.key, runicResearch.key) - .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar), new ResearchPage("gadomancy.research_page.FAMILIAR.3")).registerResearchItem(); - - ResearchItem researchTallow = PseudoResearchItem.create("TALLOW", 7, -3).registerResearchItem(); - - researchFamiliarAttack_1 = new SimpleResearchItem("FAM_ATTACK_1", - 5, -1, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 1), - new AspectList().add(Aspect.AURA, 6).add(Aspect.MAGIC, 8).add(Aspect.WEAPON, 6)) - .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 SimpleResearchItem("FAM_ATTACK_2", - 7, 0, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 2), - new AspectList().add(Aspect.AURA, 10).add(Aspect.MAGIC, 12).add(Aspect.ELDRITCH, 8).add(Aspect.WEAPON, 8)) - .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 SimpleResearchItem("FAM_ATTACK_3", - 8, 2, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 3), - new AspectList().add(Aspect.ORDER, 4).add(Aspect.AURA, 6).add(Aspect.FIRE, 6).add(Aspect.MAGIC, 6).add(Aspect.AIR, 6).add(Aspect.ELDRITCH, 8).add(Aspect.WATER, 5).add(Aspect.WEAPON, 8).add(Aspect.ENTROPY, 6).add(Aspect.EARTH, 8)) - .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 SimpleResearchItem("FAM_RANGE_1", - 4, 1, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 4), - new AspectList().add(Aspect.AURA, 8).add(Aspect.MOTION, 10).add(Aspect.MAGIC, 8).add(Aspect.VOID, 8).add(Aspect.ENERGY, 10)) - .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 SimpleResearchItem("FAM_COOLDOWN_1", - 5, 3, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 5), - new AspectList().add(Aspect.AURA, 12).add(Aspect.MAGIC, 10).add(Aspect.TAINT, 10).add(Aspect.ELDRITCH, 8).add(Aspect.WEAPON, 10).add(Aspect.VOID, 10)) - .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(); - if(ModConfig.ancientStoneRecipes) researchAncientStones = new AlternatingResearchItem("ANCIENT_STONES", -12, 1, 3, @@ -307,7 +249,7 @@ public class RegisteredResearches { .setParents(researchInfusionEnch.key, "GOGGLES").setConcealed() .setPages(new ResearchPage("gadomancy.research_page.REVEALER.1"), new ResearchPage(RegisteredRecipes.recipeRevealer)).registerResearchItem(); - researchArmorDisguise = new DisguiseResearchItem("ARMORDISGUISE", -2, 4, 1, new AspectList().add(Aspect.SLIME, 8).add(Aspect.MAGIC, 4).add(Aspect.ARMOR, 4)) + researchArmorDisguise = new DisguiseResearchItem("ARMORDISGUISE", -2, 0, 1, new AspectList().add(Aspect.SLIME, 8).add(Aspect.MAGIC, 4).add(Aspect.ARMOR, 4)) .setParents(researchInfusionEnch.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.ARMORDISGUISE.1"), new ResearchPage(new InfusionVisualDisguiseArmor(false)), new ResearchPage(new InfusionVisualDisguiseArmor(true)), new ResearchPage("gadomancy.research_page.ARMORDISGUISE.4")).registerResearchItem(); @@ -322,14 +264,6 @@ public class RegisteredResearches { public static void postInit() { ResearchItem researchJar = PseudoResearchItem.create("JARLABEL", -3, -7).registerResearchItem(); - ResearchItem researchEssentiaMirror = null; - if(Config.allowMirrors) { - researchEssentiaMirror = PseudoResearchItem.create("MIRRORESSENTIA", -6, -2).registerResearchItem(); - } - - if(researchBlockProtector != null) { - researchBlockProtector.setParents(researchJar.key); - } RecipeVisualStickyJar visualRecipe = new RecipeVisualStickyJar(); ResearchPage page = new ResearchPage(visualRecipe); @@ -339,7 +273,11 @@ public class RegisteredResearches { .setParents(researchJar.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.STICKYJAR.1"), page).registerResearchItem(); - String[] parents = researchEssentiaMirror == null ? new String[] { researchJar.key } : new String[] { researchJar.key, researchEssentiaMirror.key }; + if(researchBlockProtector != null) { + researchBlockProtector.setParents(researchStickyJar.key); + } + + String[] parents = Config.allowMirrors ? new String[] { researchJar.key, "MIRRORESSENTIA" } : new String[] { researchJar.key }; 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)) diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 7ccdc93..5be0453 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -1,11 +1,13 @@ item.ItemGolemPlacer.silverwood.name=Silverwood Golem item.ItemGolemPlacer.obsidian.name=Obsidian Golem item.ItemTransformationFocus.name=[WIP] Wand Focus: Transformation -item.ItemFamiliar.name=Ethereal Familiar +item.ItemFamiliar.name=Ethereal Familiar (Deprecated) item.ItemEtherealFamiliar.name=Ethereal Familiar item.ItemAuraCore.name=Aura Core item.ItemArcanePackage.name=Arcane Package +gadomancy.lore.deprecation.back=Put in a crafting grid to get your items back! + itemGroup.gadomancy=Gadomancy tc.research_category.gadomancy=Gadomancy @@ -43,6 +45,7 @@ tc.research_text.GADOMANCY.REMOTEJAR=Mirrored transportation gadomancy.research_page.REMOTEJAR.1=The essentia mirror is excellent for moving essentia around for infusions, but you have the uncanny feeling that it has some untapped potential. Two essentia mirrors, when linked, effectively allow essentia to move between two points in space. By placing an essentia mirror inside of a specially altered warded jar, the space inside of one jar can be effectively linked to another. In order to link two jars, simply place one in the world and right click it with another mirrored jar. gadomancy.research_page.REMOTEJAR.2=If a network already exists, then the jar will be added to the current network. Unlike essentia mirrors, mirrored jar networks can have more than two jars. The space inside of a network is shared and balanced between the jars it contains. To put it simply, a two jar network will hold two jars of essentia, a three jar network will hold three, etc. Also, when one mirrored jar is filled, it will attempt to evenly distribute its contents between the other jars in its network. + tc.research_name.GADOMANCY.FAMILIAR=Ethereal Familiar tc.research_text.GADOMANCY.FAMILIAR=A arcane follower gadomancy.research_page.FAMILIAR.1=Wisps have intrigued you for some time now. Many of these sentient bits of ethereal magic seem to be passive, but when attacked, they retaliate with surprising speed and efficiency. Not only that, but sometimes just approaching a wisp too quickly will provoke an attack.This behavior gave you an unexpected inspiration. By exploiting the unusually responsive nature of a wisp, it may be possible to bend its defensive instincts to act as a personal protector. Unfortunately, wild wisps have proven to be far to unpredictable to capture. @@ -68,6 +71,7 @@ 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=The resonance of the primordial pearl has proven useful in more than one way. Combining the pearl and a primal wand focus with the wisp seems to change its frequencies drastically. The enhanced wisp attacks twice as fast as before. + tc.research_name.GADOMANCY.NODE_MANIPULATOR=Node Manipulator tc.research_text.GADOMANCY.NODE_MANIPULATOR=Almost like roulette gadomancy.research_page.NODE_MANIPULATOR.1=Aura nodes have intrigued you for the longest time. Where do they come from? Why are there so many varieties? After some time, you found yourself asking another question entirely; would it be possible to change how a node functions? After journeying far across the world and into the depths of the ancient eldritch mazes, you found a set of materials capable of changing the way aura behaves. After carefully developing these materials, and using them to augment the only device you found to be capable of channeling pure vis directly from a node, one of the most dangerous machines you could fathom finally fell within your grasp.