From 48144e4ac5bf609b7a6707908d6541d7444e5385 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Sat, 31 Oct 2015 00:28:46 +0100 Subject: [PATCH] - NodeManipulator: Finish - ExtendedNodes: Rebalancing - Recipes and Thaumonomicon entries added. --- .../common/blocks/BlockStoneMachine.java | 2 +- .../common/blocks/tiles/TileExtendedNode.java | 45 ++++---------- .../blocks/tiles/TileNodeManipulator.java | 4 +- .../common/node/ExtendedNodeType.java | 3 +- .../common/node/GrowingNodeBehavior.java | 57 +++++++++--------- .../node/NodeManipulatorResultHandler.java | 6 ++ .../registration/RegisteredManipulations.java | 47 ++++++++++++++- .../registration/RegisteredRecipes.java | 24 ++++++++ .../registration/RegisteredResearches.java | 30 +++++++-- .../common/utils/ResearchHelper.java | 34 +++++++++++ .../assets/gadomancy/lang/en_US.lang | 14 ++++- .../gadomancy/textures/misc/r_node_dark.png | Bin 0 -> 18038 bytes .../gadomancy/textures/misc/r_node_star.png | Bin 0 -> 17999 bytes 13 files changed, 190 insertions(+), 76 deletions(-) create mode 100644 src/main/java/makeo/gadomancy/common/utils/ResearchHelper.java create mode 100644 src/main/resources/assets/gadomancy/textures/misc/r_node_dark.png create mode 100644 src/main/resources/assets/gadomancy/textures/misc/r_node_star.png diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index 9d863bf..1f8be90 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -138,7 +138,7 @@ public class BlockStoneMachine extends Block { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { - if(world.getBlock(x, y - 1, z).equals(RegisteredBlocks.blockNodeManipulator) && world.getBlockMetadata(x, y - 1, z) == 5) { + if(world.getBlockMetadata(x, y, z) == 0 && world.getBlock(x, y - 1, z).equals(RegisteredBlocks.blockNodeManipulator) && world.getBlockMetadata(x, y - 1, z) == 5) { world.getBlock(x, y - 1, z).onBlockActivated(world, x, y - 1, z, p_149727_5_, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_); } return super.onBlockActivated(world, x, y, z, p_149727_5_, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_); diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index c11a40d..3a76127 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -7,6 +7,7 @@ import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.node.GrowingNodeBehavior; import makeo.gadomancy.common.utils.ExplosionHelper; +import makeo.gadomancy.common.utils.ResearchHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -31,6 +32,7 @@ import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileNode; import java.util.List; +import java.util.Random; /** * This class is part of the Gadomancy Mod @@ -54,26 +56,6 @@ public class TileExtendedNode extends TileNode implements INode { this.behavior = new GrowingNodeBehavior(this); } - public void addTypeSpecificAspects(ExtendedNodeType extendedNodeType) { - if(extendedNodeType == null) return; - switch (extendedNodeType) { - case GROWING: - List compounds = Aspect.getCompoundAspects(); - int count = 1; - if(worldObj.rand.nextInt(3) == 0) count++; - while(count > 0) { - count--; - Aspect random = compounds.get(worldObj.rand.nextInt(compounds.size())); - int val = getAspectsBase().getAmount(random) + worldObj.rand.nextInt(40) + 20; - getAspectsBase().add(random, val); - getAspects().add(random, val); - } - break; - case STARVING: - break; - } - } - @Override public void updateEntity() { super.updateEntity(); @@ -118,15 +100,7 @@ public class TileExtendedNode extends TileNode implements INode { if(livingEntity instanceof EntityPlayer && ((EntityPlayer) livingEntity).capabilities.isCreativeMode) continue; if(!behavior.mayZapNow()) continue; - String research = Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION"; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1).expand(6.0D, 6.0D, 6.0D)); - for(Object pl : players) { - EntityPlayer player = (EntityPlayer) pl; - if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), research) && ResearchManager.doesPlayerHaveRequisites(player.getCommandSenderName(), research)) { - thaumcraft.common.lib.network.PacketHandler.INSTANCE.sendTo(new PacketResearchComplete(research), (EntityPlayerMP)player); - Thaumcraft.proxy.getResearchManager().completeResearch(player, research); - } - } + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", worldObj, xCoord, yCoord, zCoord, 6); livingEntity.attackEntityFrom(DamageSource.magic, behavior.getZapDamage()); PacketTCNodeBolt packet = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 0.5F, zCoord + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ); @@ -189,11 +163,14 @@ public class TileExtendedNode extends TileNode implements INode { TileEntity t = worldObj.getTileEntity(xCoord + xx, yCoord + yy, zCoord + zz); if(t != null && t instanceof TileNode && !(xx == 0 && yy == 0 && zz == 0)) { TileNode node = (TileNode) t; - behavior.lockOnTo(node); - - worldObj.markBlockForUpdate(xCoord + xx, yCoord + yy, zCoord + zz); - node.markDirty(); - needUpdate = true; + int thisSize = getAspectsBase().visSize(); + int othersSize = node.getAspectsBase().visSize(); + if(thisSize >= othersSize) { + behavior.lockOnTo(node); + worldObj.markBlockForUpdate(xCoord + xx, yCoord + yy, zCoord + zz); + node.markDirty(); + needUpdate = true; + } } } else { needUpdate = behavior.updateBehavior(needUpdate); diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index f968254..6cf252c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -39,8 +39,8 @@ import java.util.List; */ public class TileNodeManipulator extends TileWandPedestal implements IAspectContainer, IWandable { - private static final int POSSIBLE_WORK_START = 50; - private static final int WORK_ASPECT_CAP = 250; + private static final int POSSIBLE_WORK_START = 70; + private static final int WORK_ASPECT_CAP = 150; private boolean multiblockStructurePresent = false; private boolean isMultiblock = false; diff --git a/src/main/java/makeo/gadomancy/common/node/ExtendedNodeType.java b/src/main/java/makeo/gadomancy/common/node/ExtendedNodeType.java index a0af25c..37dda47 100644 --- a/src/main/java/makeo/gadomancy/common/node/ExtendedNodeType.java +++ b/src/main/java/makeo/gadomancy/common/node/ExtendedNodeType.java @@ -10,7 +10,6 @@ package makeo.gadomancy.common.node; */ public enum ExtendedNodeType { - GROWING, - STARVING + GROWING } diff --git a/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java b/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java index eeab63d..26bf162 100644 --- a/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java +++ b/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java @@ -7,23 +7,17 @@ import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; import makeo.gadomancy.common.registration.RegisteredBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import makeo.gadomancy.common.utils.ResearchHelper; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.EntityAspectOrb; -import thaumcraft.common.lib.network.playerdata.PacketResearchComplete; -import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileNode; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** @@ -36,9 +30,9 @@ import java.util.Map; */ public class GrowingNodeBehavior { - public static final double SATURATION_DIFFICULTY = 10D; - public static final double SATURATION_CAP = 100D; - public static final int HAPPINESS_CAP = 1000; + public static final double SATURATION_DIFFICULTY = 15D; + public static final double SATURATION_CAP = 90D; + public static final int HAPPINESS_CAP = 500; //The node the growing node attacks. private TileNode fixedNode; @@ -73,15 +67,7 @@ public class GrowingNodeBehavior { addSaturation(aspect, increasedSaturation); owningNode.getAspectsBase().add(aspect, value); - String research = Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH"; - List players = owningNode.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(owningNode.xCoord, owningNode.yCoord, owningNode.zCoord, owningNode.xCoord + 1, owningNode.yCoord + 1, owningNode.zCoord + 1).expand(6.0D, 6.0D, 6.0D)); - for(Object pl : players) { - EntityPlayer player = (EntityPlayer) pl; - if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), research) && ResearchManager.doesPlayerHaveRequisites(player.getCommandSenderName(), research)) { - thaumcraft.common.lib.network.PacketHandler.INSTANCE.sendTo(new PacketResearchComplete(research), (EntityPlayerMP)player); - Thaumcraft.proxy.getResearchManager().completeResearch(player, research); - } - } + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", owningNode.getWorldObj(), owningNode.xCoord, owningNode.yCoord, owningNode.zCoord, 6); computeOverallSaturation(); } @@ -169,7 +155,6 @@ public class GrowingNodeBehavior { } public boolean updateBehavior(boolean needUpdate) { - //TODO fix empty nodes... if(fixedNode != null && owningNode.ticksExisted % 3 == 0) { if(owningNode.getWorldObj().getBlock(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) != RegisteredBlocks.blockNode || owningNode.getWorldObj().getTileEntity(fixedNode.xCoord, fixedNode.yCoord, fixedNode.zCoord) == null || @@ -183,10 +168,7 @@ public class GrowingNodeBehavior { int x = fixedNode.xCoord; int y = fixedNode.yCoord; int z = fixedNode.zCoord; - owningNode.getWorldObj().setBlockToAir(x, y, z); - owningNode.getWorldObj().removeTileEntity(x, y, z); - owningNode.getWorldObj().markBlockForUpdate(x, y, z); - this.fixedNode = null; + removeFixedNode(x, y, z); return needUpdate; } Aspect a = baseAspects.getAspects()[owningNode.getWorldObj().rand.nextInt(baseAspects.getAspects().length)]; @@ -201,6 +183,8 @@ public class GrowingNodeBehavior { int oz = owningNode.zCoord; currentAspects.reduce(a, 1); + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_ATTACK", owningNode.getWorldObj(), owningNode.xCoord, owningNode.yCoord, owningNode.zCoord, 16); + EntityAspectOrb aspectOrb = new EntityAspectOrb(world, fx + 0.5D, fy + 0.5D, fz + 0.5D, a, 1); Vec3 dir = Vec3.createVectorHelper(fx + 0.5D, fy + 0.5D, fz + 0.5D).subtract(Vec3.createVectorHelper(ox + 0.5D, oy + 0.5D, oz + 0.5D)).normalize(); dir.addVector(randOffset(), randOffset(), randOffset()).normalize(); @@ -217,16 +201,35 @@ public class GrowingNodeBehavior { world.markBlockForUpdate(fx, fy, fz); fixedNode.markDirty(); needUpdate = true; - + } else { + baseAspects.remove(a); + currentAspects.remove(a); + int x = fixedNode.xCoord; + int y = fixedNode.yCoord; + int z = fixedNode.zCoord; + removeFixedNode(x, y, z); + return needUpdate; } } else { baseAspects.remove(a); currentAspects.remove(a); + int x = fixedNode.xCoord; + int y = fixedNode.yCoord; + int z = fixedNode.zCoord; + removeFixedNode(x, y, z); + return needUpdate; } } return needUpdate; } + private void removeFixedNode(int x, int y, int z) { + owningNode.getWorldObj().setBlockToAir(x, y, z); + owningNode.getWorldObj().removeTileEntity(x, y, z); + owningNode.getWorldObj().markBlockForUpdate(x, y, z); + this.fixedNode = null; + } + private float randOffset() { return owningNode.getWorldObj().rand.nextFloat() / 3; } @@ -265,9 +268,7 @@ public class GrowingNodeBehavior { return (Math.log(i) / 6) + 1; } - private void handleOverfeed() { - //TODO let node collapse if overfed & still feeding... - } + private void handleOverfeed() {} public void readFromNBT(NBTTagCompound nbtTagCompound) { this.isSaturated = nbtTagCompound.getBoolean("overallSaturated"); diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java index 68f2d8e..9892468 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java @@ -75,6 +75,12 @@ public class NodeManipulatorResultHandler { //Modifier pair possibleResults.add(RegisteredManipulations.resultIncreaseModifier); possibleResults.add(RegisteredManipulations.resultDecreaseModifier); + + //Switch node Type + possibleResults.add(RegisteredManipulations.resultSwitchType); + + //Almighty Growing + possibleResults.add(RegisteredManipulations.resultApplyGrowing); } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java index bc99a25..03965ff 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java @@ -1,11 +1,15 @@ package makeo.gadomancy.common.registration; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.node.NodeManipulatorResult; import makeo.gadomancy.common.node.NodeManipulatorResultHandler; +import makeo.gadomancy.common.utils.ResearchHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.NodeModifier; +import thaumcraft.api.nodes.NodeType; /** * This class is part of the Gadomancy Mod @@ -39,7 +43,7 @@ public class RegisteredManipulations { } }; - public static NodeManipulatorResult resultCombineAspects = new NodeManipulatorResult(4) { + public static NodeManipulatorResult resultCombineAspects = new NodeManipulatorResult(5) { @Override public boolean affect(TileExtendedNode node) { AspectList base = node.getAspectsBase(); @@ -87,7 +91,7 @@ public class RegisteredManipulations { } }; - public static NodeManipulatorResult resultIncreaseModifier = new NodeManipulatorResult(1) { + public static NodeManipulatorResult resultIncreaseModifier = new NodeManipulatorResult(4) { @Override public boolean canAffect(TileExtendedNode node) { @@ -114,7 +118,7 @@ public class RegisteredManipulations { } }; - public static NodeManipulatorResult resultDecreaseModifier = new NodeManipulatorResult(1) { + public static NodeManipulatorResult resultDecreaseModifier = new NodeManipulatorResult(5) { @Override public boolean canAffect(TileExtendedNode node) { @@ -141,4 +145,41 @@ public class RegisteredManipulations { } }; + public static NodeManipulatorResult resultSwitchType = new NodeManipulatorResult(2) { + @Override + public boolean affect(TileExtendedNode node) { + NodeType newType = node.getNodeType(); + int random = node.getWorldObj().rand.nextInt(40); + if(random > 38) { + newType = NodeType.HUNGRY; //1 of 40 + } else if(random > 37) { + newType = NodeType.TAINTED; //1 of 40 + } else if(random > 34) { + newType = NodeType.UNSTABLE; //3 of 40 + } else if(random > 29) { + newType = NodeType.DARK; //5 of 40 + } else if(random > 24) { + newType = NodeType.PURE; //5 of 40 + } else if(random > 14) { + newType = NodeType.NORMAL; //10 of 40 + } + //15 of 40 chance nothing happens + boolean changed = !newType.equals(node.getNodeType()); + if(changed) node.setNodeType(newType); + return changed; + } + }; + + public static NodeManipulatorResult resultApplyGrowing = new NodeManipulatorResult(1) { + @Override + public boolean affect(TileExtendedNode node) { + boolean isGrowingAlready = node.getExtendedNodeType() != null && node.getExtendedNodeType().equals(ExtendedNodeType.GROWING); + if(!isGrowingAlready) { + node.setExtendedNodeType(ExtendedNodeType.GROWING); + ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING", node.getWorldObj(), node.xCoord, node.yCoord, node.zCoord, 12); + } + return isGrowingAlready; + } + }; + } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 7b5c0f0..1f2d07a 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -1,6 +1,8 @@ package makeo.gadomancy.common.registration; +import jdk.nashorn.internal.runtime.regexp.joni.Config; 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.research.SimpleResearchItem; @@ -33,10 +35,14 @@ public class RegisteredRecipes { public static AspectList costsNodeManipulatorMultiblock = new AspectList().add(Aspect.FIRE, 100).add(Aspect.WATER, 100).add(Aspect.EARTH, 100).add(Aspect.AIR, 100).add(Aspect.ORDER, 100).add(Aspect.ENTROPY, 100); + public static List multiblockNodeManipulator; + public static InfusionRecipe recipeGolemSilverwood; public static InfusionRecipe[] recipesGolemRunicShield; public static InfusionRecipe recipeGolemCoreBreak; public static InfusionRecipe recipeInfusionClaw; + public static InfusionRecipe recipeNodeManipulator; + public static InfusionRecipe recipeRandomizationFocus; public static IArcaneRecipe recipeStickyJar; public static IArcaneRecipe recipeArcaneDropper; @@ -72,6 +78,24 @@ public class RegisteredRecipes { new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{new ItemStack(ConfigItems.itemFocusPrimal), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemGolemCore, 1, 8), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 15), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6)}); recipeRemoteJar = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("REMOTEJAR"), new ItemStack(RegisteredBlocks.blockRemoteJar), new AspectList().add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), "GJG", "GMG", 'G', new ItemStack(ConfigBlocks.blockMagicalLog), 'J', new ItemStack(ConfigBlocks.blockJar), 'M', new ItemStack(ConfigBlocks.blockMirror, 1, 6)); + + recipeNodeManipulator = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", + new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), 10, + new AspectList().add(Aspect.AURA, 42).add(Aspect.ELDRITCH, 22).add(Aspect.MAGIC, 38).add(Aspect.MECHANISM, 28).add(Aspect.DARKNESS, 14), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), + new ItemStack[] {new ItemStack(ConfigBlocks.blockStoneDevice, 1, 9), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 3), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 15)}); + + recipeRandomizationFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", + new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 0), 7, + new AspectList().add(Aspect.ELDRITCH, 18).add(Aspect.MAGIC, 18).add(Aspect.MECHANISM, 20).add(Aspect.DARKNESS, 28).add(Aspect.ORDER, 30), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 8), + new ItemStack[] {new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16)}); + + multiblockNodeManipulator = Arrays.asList(costsNodeManipulatorMultiblock, 3, 3, 3, + Arrays.asList( + null, null, null, null, new ItemStack(RegisteredBlocks.blockNode, 1, 5), null, null, null, null, + 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))); } private static IArcaneRecipe[] stickyJarRecipes = null; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 52fe13d..193c0ac 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -37,9 +37,13 @@ public class RegisteredResearches { public static ResearchItem researchGolemCoreBreak; public static ResearchItem researchInfusionClaw; public static ResearchItem researchRemoteJar; + public static ResearchItem researchNodeManipulator; + + //Growing nodes stuff public static ResearchItem researchGrowingNodes; public static ResearchItem researchGrowingNodeAgression; public static ResearchItem researchGrowingNodeGrowth; + public static ResearchItem researchGrowingNodeAttackNodes; public static ResearchItem researchGrowingNodeGrowthClue; public static void init() { @@ -74,13 +78,25 @@ public class RegisteredResearches { ResearchItem researchFocusPrimal = PseudoResearchItem.create("FOCUSPRIMAL", -2, -3).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), 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() .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)) + .setConcealed().setSpecial() + .setParents(researchItemVoidMetal.key, researchNodeStabilizer.key, researchWardingStone.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")) - .setSpecial().setLost() + .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)) @@ -88,19 +104,25 @@ public class RegisteredResearches { .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("thaumcraft", "textures/misc/r_nodes_2.png")) + researchGrowingNodeGrowth = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH", Gadomancy.MODID, new AspectList(), 3, 5, 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")) + .setLost() + .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING") + .setPages(new ResearchPage("gadomancy.research_page.GROWING_ATTACK.1")).registerResearchItem(); + 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, 0)) + 6, 6, 2, new ItemStack(ConfigBlocks.blockAiry, 1, 5)) .setSpecial().setRound().setConcealed() - .setParents(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH") + .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(); + ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", 4); ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3); } diff --git a/src/main/java/makeo/gadomancy/common/utils/ResearchHelper.java b/src/main/java/makeo/gadomancy/common/utils/ResearchHelper.java new file mode 100644 index 0000000..7c3f473 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/utils/ResearchHelper.java @@ -0,0 +1,34 @@ +package makeo.gadomancy.common.utils; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.network.playerdata.PacketResearchComplete; +import thaumcraft.common.lib.research.ResearchManager; + +import java.util.List; + +/** + * 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 @ 30.10.2015 21:23 + */ +public class ResearchHelper { + + public static void distributeResearch(String research, World world, double x, double y, double z, double radius) { + List players = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(radius, radius, radius)); + for(Object pl : players) { + EntityPlayer player = (EntityPlayer) pl; + if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), research) && ResearchManager.doesPlayerHaveRequisites(player.getCommandSenderName(), research)) { + thaumcraft.common.lib.network.PacketHandler.INSTANCE.sendTo(new PacketResearchComplete(research), (EntityPlayerMP)player); + Thaumcraft.proxy.getResearchManager().completeResearch(player, research); + } + } + } + +} diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index fa3041d..c5ce1ad 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -32,10 +32,16 @@ tc.research_name.GADOMANCY.REMOTEJAR=Mirrored Jars tc.research_text.GADOMANCY.REMOTEJAR=Mirrored transportation gadomancy.research_page.REMOTEJAR.1=Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr. +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. +gadomancy.research_page.NODE_MANIPULATOR.3=This doesn't seem to be enough though. Even by adding one of your newest inventions, the Void Seeds, to it, it doesn't seem to be capable of holding the Node in position... You figured out that a focus, enhanced by Void Metal, might be strong enough to keep it in position. Still the machine isn't capable of modifying a node on its own. Placing some manipulation pillars near the machine should help fixing that issue. +gadomancy.research_page.NODE_MANIPULATOR.6=This machine doesn't work for free obviously. Once there is a node above the Node Manipulator and the pillars are formed, you need to place a wand or a staff into the Manipulator and it will drain the Vis from the wand into the manipulator. Once at least 70 of each Vis is stored, the Manipulator starts manipulating the node. However, you can store more than 70 Vis in the Manipulator. The more the better maybe...? You don't know the possible outcomes yet, but you should at least try it a few times.. What could possibly go wrong? + tc.research_name.GADOMANCY.GROWING=Growing Nodes tc.research_text.GADOMANCY.GROWING=Hungry Nodes v2.0 gadomancy.research_page.GROWING.1=This node is something... different.
You did expect an Energized Node to be the only stable connection between us and the source of all Vis, but this Aura Node seems very stable too. Energizing an Aura Node channels Vis from its source to our end and breaks it down to the purest primal Aspects.
But... this node behaves so different from the other nodes. It seems to search for something... It seems... restless... -gadomancy.research_page.GROWING.2=What is it searching for? Judging from my knowledge so far it can be compared to a hungry Aura Node, but still... You should keep an Eye on this. +gadomancy.research_page.GROWING.2=What is it searching for? Judging from my knowledge so far it can be compared to a hungry Aura Node, but still... You should really keep a close eye on this new type of nodes. tc.research_name.GADOMANCY.GROWING_AGGRESSION=Aggressive Behavior tc.research_text.GADOMANCY.GROWING_AGGRESSION=Taking a step back @@ -46,10 +52,14 @@ tc.research_text.GADOMANCY.GROWING_GROWTH=A picky one. gadomancy.research_page.GROWING_GROWTH.1=I was right! The node has similarities to a hungry node! It grew bigger than before!
But it looks light the node only attracts things that contains Vis in its purest form. So the node should attract things like Wisps or Ethereal Essence. Hmm... As far as my research goes, it seems that the more pure the aspect is, the more likely it will fuse with the node. It seems that the node attracts Aspect Orbs and Wisps the most as they are the most pure. gadomancy.research_page.GROWING_GROWTH.2=Materialized or solid vis in forms of essentia like Mana Beans, Ethereal Essence or Crystallized Essentia may work too, but may have bad outcome in the end...
Still it is by far more fascinating than a hungry node. In contrast to its hungry brother, this node seems to keep the complexity of its gained compound aspects instead of breaking them down to primal aspects. After all it does seem that this node does not like primal aspects at all..? +tc.research_name.GADOMANCY.GROWING_ATTACK=Destroying Behavior +tc.research_text.GADOMANCY.GROWING_ATTACK=Stop bullying! +gadomancy.research_page.GROWING_ATTACK.1=Whoa, what an interesting sight! It seems the growing node does not only bully the other nodes as we know it - it's more like completely destroying the other node. If the growing node can find another node within range it attacks it and breaks the other node into little Aspect orbs.
Further research shows that the node stabilizers cannot stop the growing node from destroying other nodes. But it seems like the growing node does not attack bigger nodes than themselves. + tc.research_name.GADOMANCY.GROWING_GROWTHCLUE=Secrets of growth tc.research_text.GADOMANCY.GROWING_GROWTHCLUE=Growing explained gadomancy.research_page.GROWING_GROWTHCLUE.1=This is it! I think i solved the puzzle of the growth and dangers of a growing node! It looks so simple: Just don't feed it the same aspects. That's what our node hates. It just wants variety and new aspects. If you feed it the same over and over it gets angry and stops growing if its too saturated. It only accepts pure aspects though. Ethereal Essence, Crystallized Essence and Mana beans are weak forms of materialized Vis. It seems the node doesn't like that... -gadomancy.research_page.GROWING_GROWTHCLUE.2=In contrast to that it seems that it really likes Wisps or Aspect Orbs. Still one of the best and most expensive things might be offering other Aura Nodes to the growing node.
But there are high risks too. The more saturated the node gets, the harder and more often the node does attack its surroundings. I wonder what happens once the node is fully saturated..? +gadomancy.research_page.GROWING_GROWTHCLUE.2=In contrast to that it seems that it really likes Wisps or Aspect Orbs. Still one of the best and most expensive things might be offering other Aura Nodes to the growing node... But there are high risks too. The more saturated the node gets, the harder and more often the node does attack its surroundings. I wonder what happens once the node is fully saturated..? gadomancy.golemblurb.default=?? gadomancy.golemblurb.breakcore=Master, should I break everything, or something specific? diff --git a/src/main/resources/assets/gadomancy/textures/misc/r_node_dark.png b/src/main/resources/assets/gadomancy/textures/misc/r_node_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..c0cf68f27d367407aa0546afde827bb04a22e92b GIT binary patch literal 18038 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 literal 0 HcmV?d00001