- Growing Nodes eat other nodes,

- Added Thaumonomicon entries for growing nodes
- Finished Vortex explosion
- Fixed Jar Bugs
- TODO: Fix TC jar bug...
This commit is contained in:
HellFirePvP committed 2015-10-26 16:11:46 +01:00
1 parent 8eedf613e0
commit 059c173333
11 files changed
+371 -97

No files matched your search

@@ -91,6 +91,7 @@ public class BlockExtendedNodeJar extends BlockContainer {
ItemStack drop = new ItemStack(RegisteredItems.itemExtendedNodeJar);
((ItemExtendedNodeJar) drop.getItem()).setAspects(drop, ((TileExtendedNodeJar) te).getAspects().copy());
((ItemExtendedNodeJar) drop.getItem()).setNodeAttributes(drop, ((TileExtendedNodeJar) te).getNodeType(), ((TileExtendedNodeJar) te).getNodeModifier(), ((TileExtendedNodeJar) te).getExtendedNodeType(), ((TileExtendedNodeJar) te).getId());
((ItemExtendedNodeJar) drop.getItem()).setBehaviorSnapshot(drop, ((TileExtendedNodeJar) te).getBehaviorSnapshot());
drops.add(drop);
}
return drops;
@@ -1,10 +1,28 @@
package makeo.gadomancy.common.blocks.tiles;
import cpw.mods.fml.common.network.NetworkRegistry;
import makeo.gadomancy.common.Gadomancy;
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 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;
/**
@@ -21,6 +39,9 @@ public class GrowingNodeBehavior {
public static final double SATURATION_CAP = 200D;
public static final int HAPPINESS_CAP = 1000;
//The node the growing node attacks.
private TileNode fixedNode;
//The node the behavior belongs to
private final TileExtendedNode owningNode;
@@ -51,6 +72,16 @@ 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);
}
}
computeOverallSaturation();
}
@@ -122,7 +153,8 @@ public class GrowingNodeBehavior {
mult -= 0.3D; //Growing node prefers aspects in their most natural form.
break;
case MANA_BEAN:
mult += 0.4D; //Mana beans are hard to breed but easy to multiply.. thus growing node doesn't like.
case CRYSTAL_ESSENCE:
mult += 0.4D; //Mana beans are hard to breed but easy to multiply.. thus growing node doesn't like. Same goes for crystallized essentia
}
if(lastFedAspect != null) {
if(lastFedAspect.equals(aspect)) {
@@ -135,6 +167,68 @@ public class GrowingNodeBehavior {
return sat * mult;
}
public boolean updateBehavior(boolean needUpdate) {
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 ||
fixedNode.isInvalid()) {
fixedNode = null;
return needUpdate;
}
AspectList currentAspects = fixedNode.getAspects();
AspectList baseAspects = fixedNode.getAspectsBase();
if(baseAspects.getAspects().length == 0) {
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;
return needUpdate;
}
Aspect a = baseAspects.getAspects()[owningNode.getWorldObj().rand.nextInt(baseAspects.getAspects().length)];
if(baseAspects.getAmount(a) > 0) {
if(baseAspects.reduce(a, 1)) {
World world = owningNode.getWorldObj();
int fx = fixedNode.xCoord;
int fy = fixedNode.yCoord;
int fz = fixedNode.zCoord;
int ox = owningNode.xCoord;
int oy = owningNode.yCoord;
int oz = owningNode.zCoord;
currentAspects.reduce(a, 1);
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();
aspectOrb.setVelocity(dir.xCoord, dir.yCoord, dir.zCoord);
fixedNode.getWorldObj().spawnEntityInWorld(aspectOrb);
NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint(world.provider.dimensionId, ox + 0.5F, oy + 0.5F, oz + 0.5F, 32);
PacketTCNodeBolt bolt = new PacketTCNodeBolt(ox + 0.5F, oy + 0.5F, oz + 0.5F, fx + 0.5F, fy + 0.5F, fz + 0.5F);
PacketHandler.INSTANCE.sendToAllAround(bolt, point);
PacketAnimationAbsorb packet = new PacketAnimationAbsorb(ox, oy, oz, fx, fy, fz);
PacketHandler.INSTANCE.sendToAllAround(packet, point);
world.markBlockForUpdate(fx, fy, fz);
fixedNode.markDirty();
needUpdate = true;
}
} else {
baseAspects.remove(a);
currentAspects.remove(a);
}
}
return needUpdate;
}
private float randOffset() {
return owningNode.getWorldObj().rand.nextFloat() / 3;
}
public boolean doesAccept(Aspect aspect) {
if(isSaturated) {
handleOverfeed();
@@ -213,9 +307,18 @@ public class GrowingNodeBehavior {
nbtTagCompound.setTag("saturationValues", list);
}
public boolean lookingForNode() {
return fixedNode == null;
}
public void lockOnTo(TileNode node) {
if(this.fixedNode == null)
this.fixedNode = node;
}
public static enum AspectType {
WISP, WISP_ESSENCE, ASPECT_ORB, MANA_BEAN
WISP, WISP_ESSENCE, ASPECT_ORB, MANA_BEAN, CRYSTAL_ESSENCE
}
@@ -1,29 +1,34 @@
package makeo.gadomancy.common.blocks.tiles;
import cpw.mods.fml.common.network.NetworkRegistry;
import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.network.PacketHandler;
import makeo.gadomancy.common.network.packets.PacketTCNodeBolt;
import makeo.gadomancy.common.utils.ExplosionHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3;
import net.minecraft.world.EnumDifficulty;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.aspects.IEssentiaContainerItem;
import thaumcraft.api.nodes.INode;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.entities.EntityAspectOrb;
import thaumcraft.common.entities.monster.EntityWisp;
import thaumcraft.common.items.ItemCrystalEssence;
import thaumcraft.common.items.ItemManaBean;
import thaumcraft.common.items.ItemWispEssence;
import thaumcraft.common.lib.network.fx.PacketFXZap;
import thaumcraft.common.lib.network.playerdata.PacketResearchComplete;
import thaumcraft.common.lib.research.ResearchManager;
import thaumcraft.common.tiles.TileNode;
import java.util.List;
@@ -39,7 +44,7 @@ import java.util.Random;
*/
public class TileExtendedNode extends TileNode {
private int ticksExisted = 0;
public int ticksExisted = 0;
private ExtendedNodeType extendedNodeType;
private GrowingNodeBehavior behavior;
@@ -55,6 +60,26 @@ public class TileExtendedNode extends TileNode {
}
}
public void addTypeSpecificAspects(ExtendedNodeType extendedNodeType) {
if(extendedNodeType == null) return;
switch (extendedNodeType) {
case GROWING:
List<Aspect> 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();
@@ -98,6 +123,17 @@ public class TileExtendedNode extends TileNode {
if ((livingEntity.isEntityAlive()) && (!livingEntity.isEntityInvulnerable())) {
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);
}
}
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);
PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 32.0D));
@@ -111,86 +147,62 @@ public class TileExtendedNode extends TileNode {
private boolean handleGrowingNodeFirst(boolean needUpdate) {
if(extendedNodeType == null || extendedNodeType != ExtendedNodeType.GROWING) return needUpdate;
List aspectOrbs = this.worldObj.getEntitiesWithinAABB(EntityAspectOrb.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(15.0D, 15.0D, 15.0D));
if ((aspectOrbs != null) && (aspectOrbs.size() > 0)) {
for (Object orb : aspectOrbs) {
EntityAspectOrb aspectOrb = (EntityAspectOrb) orb;
if ((aspectOrb.isEntityAlive()) && (!aspectOrb.isEntityInvulnerable())) {
double d = getDistanceTo(aspectOrb.posX, aspectOrb.posY, aspectOrb.posZ);
if (d < 0.5D) { //prev: 2.0D
Aspect aspect = aspectOrb.getAspect();
if (getAspects().getAmount(aspect) < getNodeVisBase(aspect)) {
addToContainer(aspect, 1);
} else {
//Adding it permanently
if(!worldObj.isRemote && behavior.doesAccept(aspect)) {
behavior.addAspect(GrowingNodeBehavior.AspectType.ASPECT_ORB, aspect, 1);
}
}
needUpdate = true;
aspectOrb.setDead();
}
}
applyMovementVectors(aspectOrb);
needUpdate = doVortex(EntityAspectOrb.class, needUpdate, new GrowingNodeVortexRunnable<EntityAspectOrb>() {
@Override
public Aspect getAspect(EntityAspectOrb entity) {
return entity.getAspect();
}
}
List items = this.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(15.0D, 15.0D, 15.0D));
if ((items != null) && (items.size() > 0)) {
for (Object item : items) {
EntityItem entityItem = (EntityItem) item;
Item it = entityItem.getEntityItem().getItem();
if(!(it instanceof ItemWispEssence || it instanceof ItemManaBean)) continue;
if ((entityItem.isEntityAlive()) && (!entityItem.isEntityInvulnerable())) {
double d = getDistanceTo(entityItem.posX, entityItem.posY, entityItem.posZ);
if (d < 0.5D) { //prev: 2.0D
IEssentiaContainerItem container = (IEssentiaContainerItem) it;
AspectList list = container.getAspects(entityItem.getEntityItem());
if(!(list == null || list.size() == 0)) {
Aspect aspect = list.getAspects()[0];
if (getAspects().getAmount(aspect) < getNodeVisBase(aspect)) {
addToContainer(aspect, 1);
} else {
//Adding it permanently
if(!worldObj.isRemote && behavior.doesAccept(aspect)) {
GrowingNodeBehavior.AspectType type = it instanceof ItemWispEssence ? GrowingNodeBehavior.AspectType.WISP_ESSENCE : GrowingNodeBehavior.AspectType.MANA_BEAN;
behavior.addAspect(type, aspect, 1);
}
}
needUpdate = true;
}
entityItem.setDead();
}
}
applyMovementVectors(entityItem);
}
}
List wisps = this.worldObj.getEntitiesWithinAABB(EntityWisp.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(15.0D, 15.0D, 15.0D));
if ((wisps != null) && (wisps.size() > 0)) {
for (Object wispObj : wisps) {
EntityWisp wisp = (EntityWisp) wispObj;
if ((wisp.isEntityAlive()) && (!wisp.isEntityInvulnerable())) {
double d = getDistanceTo(wisp.posX, wisp.posY, wisp.posZ);
if (d < 0.5D) { //prev: 2.0D
Aspect aspect = Aspect.getAspect(wisp.getType());
if(aspect != null) {
if (getAspects().getAmount(aspect) < getNodeVisBase(aspect)) {
addToContainer(aspect, 1);
} else {
//Adding it permanently
if(!worldObj.isRemote && behavior.doesAccept(aspect)) {
behavior.addAspect(GrowingNodeBehavior.AspectType.WISP, aspect, 1);
}
}
needUpdate = true;
}
wisp.setDead();
}
}
applyMovementVectors(wisp);
@Override
public GrowingNodeBehavior.AspectType getAspectType(EntityAspectOrb entity) {
return GrowingNodeBehavior.AspectType.ASPECT_ORB;
}
});
needUpdate = doVortex(EntityItem.class, needUpdate, new GrowingNodeVortexRunnable<EntityItem>() {
@Override
public boolean doesVortex(EntityItem entity) {
return entity.getEntityItem().getItem() instanceof ItemWispEssence || entity.getEntityItem().getItem() instanceof ItemManaBean || entity.getEntityItem().getItem() instanceof ItemCrystalEssence;
}
@Override
public Aspect getAspect(EntityItem entity) {
IEssentiaContainerItem container = (IEssentiaContainerItem) entity.getEntityItem().getItem();
return container.getAspects(entity.getEntityItem()).getAspects().length > 0 ? container.getAspects(entity.getEntityItem()).getAspects()[0] : null;
}
@Override
public GrowingNodeBehavior.AspectType getAspectType(EntityItem entity) {
return entity.getEntityItem().getItem() instanceof ItemWispEssence ? GrowingNodeBehavior.AspectType.WISP_ESSENCE : entity.getEntityItem().getItem() instanceof ItemCrystalEssence ? GrowingNodeBehavior.AspectType.CRYSTAL_ESSENCE : GrowingNodeBehavior.AspectType.MANA_BEAN;
}
});
needUpdate = doVortex(EntityWisp.class, needUpdate, new GrowingNodeVortexRunnable<EntityWisp>() {
@Override
public Aspect getAspect(EntityWisp entity) {
return Aspect.getAspect(entity.getType());
}
@Override
public GrowingNodeBehavior.AspectType getAspectType(EntityWisp entity) {
return GrowingNodeBehavior.AspectType.WISP;
}
});
if(worldObj.isRemote) return needUpdate;
if(behavior.lookingForNode()) {
int xx = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8);
int yy = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8);
int zz = worldObj.rand.nextInt(8) - worldObj.rand.nextInt(8);
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;
}
} else {
needUpdate = behavior.updateBehavior(needUpdate);
}
return needUpdate;
}
@@ -209,6 +221,36 @@ public class TileExtendedNode extends TileNode {
}
}
private <E extends Entity> boolean doVortex(Class<E> entityClass, boolean needUpdate, GrowingNodeVortexRunnable<E> runnable) {
List entities = this.worldObj.getEntitiesWithinAABB(entityClass, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(15.0D, 15.0D, 15.0D));
if ((entities != null) && (entities.size() > 0)) {
for (Object eObj : entities) {
E entity = (E) eObj;
if(!runnable.doesVortex(entity)) continue;
if ((entity.isEntityAlive()) && (!entity.isEntityInvulnerable())) {
double d = getDistanceTo(entity.posX, entity.posY, entity.posZ);
if (d < 0.5D) { //prev: 2.0D
Aspect a = runnable.getAspect(entity);
if(a != null) {
if (getAspects().getAmount(a) < getNodeVisBase(a)) {
addToContainer(a, 1);
} else {
//Adding it permanently
if(!worldObj.isRemote && behavior.doesAccept(a)) {
behavior.addAspect(runnable.getAspectType(entity), a, 1);
}
}
}
needUpdate = true;
entity.setDead();
}
}
applyMovementVectors(entity);
}
}
return needUpdate;
}
public ExtendedNodeType getExtendedNodeType() {
return extendedNodeType;
}
@@ -217,6 +259,21 @@ public class TileExtendedNode extends TileNode {
this.extendedNodeType = extendedNodeType;
}
public NBTTagCompound getBehaviorSnapshot() {
if(extendedNodeType != null && extendedNodeType == ExtendedNodeType.GROWING) {
NBTTagCompound behaviorCompound = new NBTTagCompound();
behavior.writeToNBT(behaviorCompound);
return behaviorCompound;
}
return null;
}
public void readBehaviorSnapshot(NBTTagCompound tagCompound) {
if(tagCompound != null && extendedNodeType != null && extendedNodeType == ExtendedNodeType.GROWING) {
behavior.readFromNBT(tagCompound);
}
}
@Override
public void readCustomNBT(NBTTagCompound nbttagcompound) {
super.readCustomNBT(nbttagcompound);
@@ -259,4 +316,16 @@ public class TileExtendedNode extends TileNode {
doingVortexExplosion = true;
}
private abstract static class GrowingNodeVortexRunnable<E> {
public boolean doesVortex(E entity) {
return true;
}
public abstract Aspect getAspect(E entity);
public abstract GrowingNodeBehavior.AspectType getAspectType(E entity);
}
}
@@ -36,6 +36,7 @@ public class TileExtendedNodeJar extends TileJarNode {
private NodeType nodeType = NodeType.NORMAL;
private NodeModifier nodeModifier = null;
private ExtendedNodeType extendedNodeType = null;
private NBTTagCompound behaviorSnapshot = null;
private String id = "";
public long animate = 0L;
@@ -74,6 +75,9 @@ public class TileExtendedNodeJar extends TileJarNode {
if(mod >= 0) setNodeModifier(NodeModifier.values()[mod]); else setNodeModifier(null);
byte exType = nbttagcompound.getByte("extendedNodeType");
if(exType >= 0) setExtendedNodeType(ExtendedNodeType.values()[exType]); else setExtendedNodeType(null);
if(nbttagcompound.hasKey("Behavior")) {
behaviorSnapshot = nbttagcompound.getCompoundTag("Behavior");
}
}
public void writeCustomNBT(NBTTagCompound nbttagcompound) {
@@ -92,6 +96,9 @@ public class TileExtendedNodeJar extends TileJarNode {
nbttagcompound.setByte("type", (byte) getNodeType().ordinal());
nbttagcompound.setByte("modifier", getNodeModifier() == null ? -1 : (byte) getNodeModifier().ordinal());
nbttagcompound.setByte("extendedNodeType", getExtendedNodeType() == null ? -1 : (byte) getExtendedNodeType().ordinal());
if(behaviorSnapshot != null) {
nbttagcompound.setTag("Behavior", behaviorSnapshot);
}
}
public AspectList getAspects() {
@@ -188,6 +195,14 @@ public class TileExtendedNodeJar extends TileJarNode {
this.id = id;
}
public void setBehaviorSnapshot(NBTTagCompound behaviorSnapshot) {
this.behaviorSnapshot = behaviorSnapshot;
}
public NBTTagCompound getBehaviorSnapshot() {
return behaviorSnapshot;
}
public void setNodeVisBase(Aspect aspect, short nodeVisBase) {
if (this.aspectsBase.getAmount(aspect) < nodeVisBase) {
this.aspectsBase.merge(aspect, nodeVisBase);
@@ -226,6 +241,7 @@ public class TileExtendedNodeJar extends TileJarNode {
tn.setNodeType(getNodeType());
tn.setExtendedNodeType(getExtendedNodeType());
new Injector(tn, TileNode.class).setField("id", getId());
tn.readBehaviorSnapshot(getBehaviorSnapshot());
world.markBlockForUpdate(x, y, z);
tn.markDirty();
}
@@ -128,7 +128,6 @@ public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem
if (placeBlockAt(stack, player, world, x, y, z, side, par8, par9, par10, var14)) {
TileEntity te = world.getTileEntity(x, y, z);
if ((te != null) && ((te instanceof TileExtendedNodeJar))) {
if (stack.hasTagCompound()) {
AspectList aspects = getAspects(stack);
@@ -138,6 +137,7 @@ public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem
((TileExtendedNodeJar) te).setNodeModifier(getNodeModifier(stack));
((TileExtendedNodeJar) te).setExtendedNodeType(getExtendedNodeType(stack));
((TileExtendedNodeJar) te).setId(getNodeId(stack));
((TileExtendedNodeJar) te).setBehaviorSnapshot(getBehaviorSnapshot(stack));
}
}
}
@@ -194,6 +194,21 @@ public class ItemExtendedNodeJar extends Item implements IEssentiaContainerItem
itemstack.setTagInfo("nodeid", new NBTTagString(id));
}
public void setBehaviorSnapshot(ItemStack itemstack, NBTTagCompound tagCompound) {
if(tagCompound == null) return;
if (!itemstack.hasTagCompound()) {
itemstack.setTagCompound(new NBTTagCompound());
}
itemstack.setTagInfo("Behavior", tagCompound);
}
public NBTTagCompound getBehaviorSnapshot(ItemStack itemstack) {
if (!itemstack.hasTagCompound() || (!itemstack.getTagCompound().hasKey("Behavior"))) {
return null;
}
return itemstack.getTagCompound().getCompoundTag("Behavior");
}
public ExtendedNodeType getExtendedNodeType(ItemStack itemStack) {
if (!itemStack.hasTagCompound() || (!itemStack.getTagCompound().hasKey("nodeExMod"))) {
return null;
@@ -23,12 +23,12 @@ import thaumcraft.common.Thaumcraft;
*/
public class PacketAnimationAbsorb implements IMessage, IMessageHandler<PacketAnimationAbsorb, IMessage> {
private double x, y, z;
private int x, y, z;
private int targetX, targetY, targetZ;
public PacketAnimationAbsorb() {}
public PacketAnimationAbsorb(double x, double y, double z, int targetX, int targetY, int targetZ) {
public PacketAnimationAbsorb(int x, int y, int z, int targetX, int targetY, int targetZ) {
this.x = x;
this.y = y;
this.z = z;
@@ -39,9 +39,9 @@ public class PacketAnimationAbsorb implements IMessage, IMessageHandler<PacketAn
@Override
public void fromBytes(ByteBuf buf) {
this.x = buf.readDouble();
this.y = buf.readDouble();
this.z = buf.readDouble();
this.x = buf.readInt();
this.y = buf.readInt();
this.z = buf.readInt();
this.targetX = buf.readInt();
this.targetY = buf.readInt();
this.targetZ = buf.readInt();
@@ -49,9 +49,9 @@ public class PacketAnimationAbsorb implements IMessage, IMessageHandler<PacketAn
@Override
public void toBytes(ByteBuf buf) {
buf.writeDouble(x);
buf.writeDouble(y);
buf.writeDouble(z);
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
buf.writeInt(targetX);
buf.writeInt(targetY);
buf.writeInt(targetZ);
@@ -63,7 +63,7 @@ public class PacketAnimationAbsorb implements IMessage, IMessageHandler<PacketAn
Block b = Minecraft.getMinecraft().theWorld.getBlock(p.targetX, p.targetY, p.targetZ);
int md = Minecraft.getMinecraft().theWorld.getBlockMetadata(p.targetX, p.targetY, p.targetZ);
MultiTickEffectDispatcher.VortexDigInfo info =
new MultiTickEffectDispatcher.VortexDigInfo(Minecraft.getMinecraft().theWorld.provider.dimensionId, (int) p.x, (int) p.y, (int) p.z, p.targetX, p.targetY, p.targetZ, b, md);
new MultiTickEffectDispatcher.VortexDigInfo(Minecraft.getMinecraft().theWorld.provider.dimensionId, p.x, p.y, p.z, p.targetX, p.targetY, p.targetZ, b, md);
MultiTickEffectDispatcher.registerVortexDig(info);
return null;
}
@@ -9,6 +9,7 @@ import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw;
import makeo.gadomancy.common.utils.ExplosionHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.tileentity.TileEntity;
import thaumcraft.common.Thaumcraft;
/**
* This class is part of the Gadomancy Mod
@@ -22,6 +23,7 @@ public class PacketStartAnimation implements IMessage, IMessageHandler<PacketSta
public static final byte ID_INFUSIONCLAW = 0;
public static final byte ID_EX_VORTEX = 1;
public static final byte ID_BURST = 2;
private byte annimationId;
private int x;
@@ -67,6 +69,9 @@ public class PacketStartAnimation implements IMessage, IMessageHandler<PacketSta
if(te == null || !(te instanceof TileExtendedNode)) return null;
ExplosionHelper.VortexExplosion.vortexLightning((TileExtendedNode) te);
break;
case ID_BURST:
Thaumcraft.proxy.burst(Minecraft.getMinecraft().theWorld, message.x + 0.5F, message.y + 0.5F, message.z + 0.5F, Minecraft.getMinecraft().theWorld.rand.nextInt(3) + 1);
break;
}
return null;
}
@@ -7,11 +7,13 @@ import makeo.gadomancy.common.research.SimpleResearchItem;
import makeo.gadomancy.common.utils.SimpleResourceLocation;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchItem;
import thaumcraft.api.research.ResearchPage;
import thaumcraft.common.lib.research.ResearchManager;
/**
* This class is part of the Gadomancy Mod
@@ -34,8 +36,13 @@ public class RegisteredResearches {
public static ResearchItem researchGolemCoreBreak;
public static ResearchItem researchInfusionClaw;
public static ResearchItem researchRemoteJar;
public static ResearchItem researchGrowingNodes;
public static ResearchItem researchGrowingNodeAgression;
public static ResearchItem researchGrowingNodeGrowth;
public static ResearchItem researchGrowingNodeGrowthClue;
public static void init() {
ResearchCategories.registerCategory(Gadomancy.MODID, CATEGORY_ICON, CATEGORY_BACKGROUND);
ResearchItem researchAdvancedGolem = PseudoResearchItem.create("ADVANCEDGOLEM", 2, -2).registerResearchItem();
@@ -70,6 +77,30 @@ public class RegisteredResearches {
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();
researchGrowingNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING", Gadomancy.MODID, new AspectList(), 2, 2, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"))
.setSpecial().setLost()
.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(RegisteredItems.itemBlockAiryCopy, 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("thaumcraft", "textures/misc/r_nodes_2.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();
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(RegisteredItems.itemBlockAiryCopy, 1, 0))
.setSpecial().setRound().setConcealed()
.setParents(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTH")
.setPages(new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.1"), new ResearchPage("gadomancy.research_page.GROWING_GROWTHCLUE.2")).registerResearchItem();
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3);
}
public static void postInit() {
@@ -1,5 +1,6 @@
package makeo.gadomancy.common.utils;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.network.NetworkRegistry;
import makeo.gadomancy.common.blocks.tiles.TileExtendedNode;
import makeo.gadomancy.common.network.PacketHandler;
@@ -8,6 +9,9 @@ import makeo.gadomancy.common.network.packets.PacketStartAnimation;
import makeo.gadomancy.common.network.packets.PacketTCNodeBolt;
import makeo.gadomancy.common.registration.RegisteredBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.SoundHandler;
import net.minecraft.client.audio.SoundRegistry;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -88,6 +92,11 @@ public class ExplosionHelper {
}
}
}
if(phase < 2 && world.rand.nextInt(phase == 0 ? 8 : 4) == 0) {
PacketStartAnimation packet = new PacketStartAnimation(PacketStartAnimation.ID_BURST, x, y, z);
PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32.0D));
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "thaumcraft:ice", 0.8F, 1.0F);
}
switch (phase) {
case 0: {
tick++;
@@ -123,7 +132,7 @@ public class ExplosionHelper {
Block b = world.getBlock(xx, yy, zz);
float hardness = b.getBlockHardness(world, xx, yy, zz);
if(b != Blocks.air && hardness > 0 && hardness <= 50 && b != RegisteredBlocks.blockNode) {
PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(x + 0.5D, y + 0.5D, z + 0.5D, xx, yy, zz);
PacketAnimationAbsorb absorb = new PacketAnimationAbsorb(x, y, z, xx, yy, zz);
PacketHandler.INSTANCE.sendToAllAround(absorb, new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32D));
pastTickBlocks.add(Vec3.createVectorHelper(xx, yy, zz));
}
@@ -9,6 +9,7 @@ import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
@@ -18,6 +19,7 @@ import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.nodes.INode;
import thaumcraft.api.nodes.NodeModifier;
import thaumcraft.api.nodes.NodeType;
import thaumcraft.common.blocks.BlockJar;
import thaumcraft.common.blocks.BlockMagicalLog;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.lib.research.ResearchManager;
@@ -205,11 +207,13 @@ public class JarMultiblockHandler {
int nt = node.getNodeType().ordinal();
int nm = -1;
int exNt = -1;
NBTTagCompound behaviorSnapshot = null;
if (node.getNodeModifier() != null) {
nm = node.getNodeModifier().ordinal();
}
if(tile instanceof TileExtendedNode && ((TileExtendedNode) tile).getExtendedNodeType() != null) {
exNt = ((TileExtendedNode) tile).getExtendedNodeType().ordinal();
behaviorSnapshot = ((TileExtendedNode) tile).getBehaviorSnapshot();
}
if(degrade) {
if (world.rand.nextFloat() < 0.75F) {
@@ -235,7 +239,11 @@ public class JarMultiblockHandler {
}
exJar.setNodeType(NodeType.values()[nt]);
exJar.setExtendedNodeType(ExtendedNodeType.values()[exNt]);
if(behaviorSnapshot != null) {
exJar.setBehaviorSnapshot(behaviorSnapshot);
}
exJar.setId(nid);
world.addBlockEvent(x + xx, y - yy + 2, z + zz, RegisteredBlocks.blockExtendedNodeJar, 9, 0);
} else {
world.setBlock(x + xx, y - yy + 2, z + zz, ConfigBlocks.blockJar, 2, 3);
tile = world.getTileEntity(x + xx, y - yy + 2, z + zz);
@@ -246,10 +254,8 @@ public class JarMultiblockHandler {
}
jar.setNodeType(NodeType.values()[nt]);
jar.setId(nid);
world.addBlockEvent(x + xx, y - yy + 2, z + zz, ConfigBlocks.blockJar, 9, 0);
}
//TC does nothing here tho...
world.addBlockEvent(x + xx, y - yy + 2, z + zz, ConfigBlocks.blockJar, 9, 0);
}
public abstract static class JarPieceEvaluationRunnable {