diff --git a/src/main/java/makeo/gadomancy/api/AuraEffect.java b/src/main/java/makeo/gadomancy/api/AuraEffect.java new file mode 100644 index 0000000..844d0a0 --- /dev/null +++ b/src/main/java/makeo/gadomancy/api/AuraEffect.java @@ -0,0 +1,19 @@ +package makeo.gadomancy.api; + +import net.minecraft.entity.Entity; + +/** + * 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 @ 17.11.2015 14:36 + */ +public abstract interface AuraEffect { + + public abstract boolean isEntityApplicable(Entity e); + + public abstract void applyEffect(Entity e); + +} diff --git a/src/main/java/makeo/gadomancy/api/GadomancyApi.java b/src/main/java/makeo/gadomancy/api/GadomancyApi.java index d26b412..9fc238e 100644 --- a/src/main/java/makeo/gadomancy/api/GadomancyApi.java +++ b/src/main/java/makeo/gadomancy/api/GadomancyApi.java @@ -4,6 +4,7 @@ import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.api.internal.IApiHandler; import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.EnumGolemType; @@ -63,6 +64,10 @@ public abstract class GadomancyApi { return handler.registerAdditionalGolemCore(name, core); } + public static void registerAdditionalAuraEffect(Aspect aspect, AuraEffect effect) { + handler.registerAdditionalAuraEffect(aspect, effect); + } + public static List getAdditionalGolemCores() { return handler.getAdditionalGolemCores(); } diff --git a/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java b/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java index e82f867..1f1a8f4 100644 --- a/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java +++ b/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java @@ -1,9 +1,11 @@ package makeo.gadomancy.api.internal; +import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; import java.util.List; @@ -34,4 +36,6 @@ public interface IApiHandler { List getAdditionalGolemCores(); void registerClawClickBehavior(ClickBehavior clickBehavior); + + void registerAdditionalAuraEffect(Aspect aspect, AuraEffect effect); } diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 2d1dc4d..c9a27ae 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -25,7 +25,7 @@ import makeo.gadomancy.client.renderers.item.ItemRenderTileEntityMulti; import makeo.gadomancy.client.renderers.tile.*; import makeo.gadomancy.common.CommonProxy; import makeo.gadomancy.common.blocks.tiles.*; -import makeo.gadomancy.common.entities.fake.EntityPermNoClipItem; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java index 3663f64..6ca6b6c 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java @@ -68,7 +68,7 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { Aspect a = ((TileAuraPylonTop) tile).getAspect(); if(a == null) a = Aspect.WEATHER; Color c = new Color(a.getColor()); - if(tile.getWorldObj().rand.nextInt(9) == 0) { + if(tile.getWorldObj().rand.nextInt(12) == 0) { if(a == Aspect.ENTROPY || a == Aspect.DARKNESS || a == Aspect.UNDEAD) { spawnWispParticles((TileAuraPylonTop) tile, 5, 0.5F, false); } else { @@ -76,7 +76,7 @@ public class RenderTileAuraPylon extends TileEntitySpecialRenderer { } } c = c.darker().darker(); - if(tile.getWorldObj().rand.nextInt(15) == 0) { + if(tile.getWorldObj().rand.nextInt(20) == 0) { if(a == Aspect.ENTROPY || a == Aspect.DARKNESS || a == Aspect.UNDEAD) { spawnWispParticles((TileAuraPylonTop) tile, 5, 0.25F, false); } else { diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index c9be316..7cef757 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -9,7 +9,7 @@ import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.common.containers.ContainerArcanePackager; import makeo.gadomancy.common.containers.ContainerInfusionClaw; import makeo.gadomancy.common.data.ModConfig; -import makeo.gadomancy.common.entities.fake.EntityPermNoClipItem; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.events.EventHandlerEntity; import makeo.gadomancy.common.events.EventHandlerGolem; import makeo.gadomancy.common.events.EventHandlerNetwork; @@ -87,7 +87,7 @@ public class CommonProxy implements IGuiHandler { DimensionManager.registerProviderType(ModConfig.dimOuterId, WorldProviderTCEldrich.class, true); DimensionManager.registerDimension(ModConfig.dimOuterId, ModConfig.dimOuterId); - EntityRegistry.registerModEntity(EntityPermNoClipItem.class, "EntityPermItem", EntityRegistry.findGlobalUniqueEntityId(), Gadomancy.instance, 32, 10, true); + EntityRegistry.registerModEntity(EntityPermNoClipItem.class, "EntityPermItem", EntityRegistry.findGlobalUniqueEntityId(), Gadomancy.instance, 32, 40, false); } public void postInitalize() { diff --git a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java index 193a974..9fb8761 100644 --- a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java +++ b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java @@ -1,6 +1,7 @@ package makeo.gadomancy.common.api; import cpw.mods.fml.common.registry.GameRegistry; +import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; @@ -10,11 +11,15 @@ import makeo.gadomancy.common.data.ModConfig; import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.AuraEffectHandler; import makeo.gadomancy.common.utils.GolemEnumHelper; import makeo.gadomancy.common.utils.NBTHelper; import makeo.gadomancy.common.utils.StringHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; import java.util.ArrayList; @@ -31,6 +36,9 @@ import java.util.Map; * Created by makeo @ 14.10.2015 14:38 */ public class DefaultApiHandler implements IApiHandler { + + private static final Logger log = LogManager.getLogger("Gadomancy_API"); + private static Map additionalGolemTypes = new HashMap(); @Override @@ -119,4 +127,14 @@ public class DefaultApiHandler implements IApiHandler { public void registerClawClickBehavior(ClickBehavior clickBehavior) { RegisteredBlocks.registerClawClickBehavior(clickBehavior); } + + @Override + public void registerAdditionalAuraEffect(Aspect aspect, AuraEffect effect) { + if(aspect == null || effect == null) return; + if(AuraEffectHandler.registeredEffects.containsKey(aspect)) { + log.warn("AuraEffect for '" + aspect.getTag() + "' is already registered!"); + } else { + AuraEffectHandler.registeredEffects.put(aspect, effect); + } + } } 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 b7d82e0..3796593 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java @@ -1,8 +1,7 @@ package makeo.gadomancy.common.blocks.tiles; -import makeo.gadomancy.common.blocks.BlockAuraPylon; -import makeo.gadomancy.common.entities.fake.EntityPermNoClipItem; -import makeo.gadomancy.common.utils.ItemUtils; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; +import makeo.gadomancy.common.utils.AuraEffectHandler; import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; @@ -12,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.ThaumcraftApiHelper; @@ -22,7 +20,6 @@ import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXEssentiaTrail; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.EntityPermanentItem; import thaumcraft.common.entities.EntitySpecialItem; import thaumcraft.common.items.ItemCrystalEssence; @@ -77,8 +74,12 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } if (isMasterTile()) { - if(holdingAspect != null) { - handleEffectDistribution(); + TileAuraPylon io = getInputTile(); + if(io != null && io.amount > 0) { + if ((ticksExisted & 31) == 0) { + doAuraEffects(holdingAspect); + drainEssentia(io); + } } } } else { @@ -95,6 +96,20 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } } + private void doAuraEffects(Aspect aspect) { + if(aspect == null) return; + if(!isMasterTile()) return; + if(worldObj.isRemote) return; + AuraEffectHandler.distributeEffects(aspect, worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 8); + } + + private void drainEssentia(TileAuraPylon io) { + if(!isMasterTile()) return; + io.amount--; + worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); + io.markDirty(); + } + //Client-Side input tile only! private void doEssentiaTrail() { if((ticksExisted & 1) == 0) return; @@ -102,20 +117,22 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont if(tile == null) return; TileAuraPylon inputTile = getInputTile(); if(inputTile == null) return; - Aspect a = getAspectType(); + Aspect a = inputTile.getAspectType(); if(a == null) return; + if(inputTile.amount <= 0) return; int count = 5; FXEssentiaTrail essentiaTrail = new FXEssentiaTrail(tile.getWorldObj(), inputTile.xCoord + 0.5, inputTile.yCoord + 0.2, inputTile.zCoord + 0.5, tile.xCoord + 0.5, tile.yCoord + 1.7, tile.zCoord + 0.5, count, a.getColor(), 1); essentiaTrail.noClip = true; essentiaTrail.motionY = (0.1F + MathHelper.sin(count / 3.0F) * 0.01F); essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.001F + worldObj.rand.nextGaussian() * 0.002000000094994903D); - essentiaTrail.motionX = (MathHelper.sin(count / 10.0F) * 0.001F + worldObj.rand.nextGaussian() * 0.002000000094994903D); + essentiaTrail.motionZ = (MathHelper.sin(count / 10.0F) * 0.001F + worldObj.rand.nextGaussian() * 0.002000000094994903D); ParticleEngine.instance.addEffect(tile.getWorldObj(), essentiaTrail); } //Special to masterTile only! - private void handleEffectDistribution() { + private void distributeAspectInformation() { + if(!isMasterTile()) return; int count = 1; TileEntity iter = worldObj.getTileEntity(xCoord, yCoord - count, zCoord); while(iter != null && iter instanceof TileAuraPylon) { @@ -132,10 +149,10 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont TileAuraPylon io = getInputTile(); if (io == null) return; int masterY = yCoord + 1; - int dst = (masterY - io.yCoord) / 2; - ChunkCoordinates rel = new ChunkCoordinates(xCoord, masterY - dst, zCoord); + float dst = ((float) (masterY - io.yCoord)) / 2F; + float yC = masterY - dst; List entityItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, - AxisAlignedBB.getBoundingBox(rel.posX - 0.5, rel.posY - 0.5, rel.posZ - 0.5, rel.posX + 0.5, rel.posY + 0.5, rel.posZ + 0.5).expand(8, 8, 8), new IEntitySelector() { + AxisAlignedBB.getBoundingBox(xCoord - 0.5, yC - 0.5, zCoord - 0.5, xCoord + 0.5, yC + 0.5, zCoord + 0.5).expand(8, 8, 8), new IEntitySelector() { @Override public boolean isEntityApplicable(Entity e) { return !(e instanceof EntityPermanentItem) && !(e instanceof EntitySpecialItem) && @@ -144,9 +161,9 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } }); Entity dummy = new EntityItem(worldObj); - dummy.posX = rel.posX + 0.5; - dummy.posY = rel.posY + 0.5; - dummy.posZ = rel.posZ + 0.5; + dummy.posX = xCoord + 0.5; + dummy.posY = yC + 0.5; + dummy.posZ = zCoord + 0.5; //MC code. EntityItem entity = null; @@ -162,10 +179,10 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } } if(entity == null) return; - if(dummy.getDistanceToEntity(entity) < 3 && !worldObj.isRemote) { + if(dummy.getDistanceToEntity(entity) < 1 && !worldObj.isRemote) { this.crystalEssentiaStack = entity.getEntityItem(); - EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, rel.posX + 0.5F, rel.posY + 0.5F, rel.posZ + 0.5F, crystalEssentiaStack, xCoord, yCoord, zCoord); + EntityPermNoClipItem item = new EntityPermNoClipItem(entity.worldObj, xCoord + 0.5F, yC + 0.3F, zCoord + 0.5F, crystalEssentiaStack, xCoord, yCoord, zCoord); entity.worldObj.spawnEntityInWorld(item); item.setVelocity(0, 0, 0); item.hoverStart = entity.hoverStart; @@ -173,6 +190,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont item.noClip = true; holdingAspect = ((ItemCrystalEssence) crystalEssentiaStack.getItem()).getAspects(crystalEssentiaStack).getAspects()[0]; + distributeAspectInformation(); entity.setDead(); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -200,7 +218,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont //Special to inputTile only! private void handleIO() { - if ((!worldObj.isRemote) && ((ticksExisted & 7) == 0) && (getEssentiaAmount() < getMaxAmount())) { + if ((!worldObj.isRemote) && ((ticksExisted & 15) == 0) && (getEssentiaAmount() < getMaxAmount())) { TileEntity te = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.DOWN); if (te != null) { IEssentiaTransport ic = (IEssentiaTransport) te; @@ -219,7 +237,14 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont if(!isMasterTile()) return; this.crystalEssentiaStack = null; this.holdingAspect = null; - handleEffectDistribution(); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); + distributeAspectInformation(); + TileAuraPylon io = getInputTile(); + if(io == null) return; + io.amount = 0; + worldObj.markBlockForUpdate(io.xCoord, io.yCoord, io.zCoord); + io.markDirty(); } //Individual. @@ -355,6 +380,8 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont String tag = compound.getString("aspect"); if (tag != null && !tag.equals("")) { this.holdingAspect = Aspect.getAspect(tag); + } else { + this.holdingAspect = null; } this.amount = compound.getInteger("amount"); this.maxAmount = compound.getInteger("maxAmount"); @@ -412,8 +439,8 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont if (!isInputTile()) return 0; if (aspect == null) return 0; - if (holdingAspect != null && this.amount < maxAmount && aspect == holdingAspect) { - int added = Math.min(amount, this.maxAmount - this.amount); + if (holdingAspect != null && this.amount < getMaxAmount() && aspect == holdingAspect) { + int added = Math.min(amount, getMaxAmount() - this.amount); this.amount += added; amount -= added; this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java index 216e5ee..a17bd7e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java @@ -8,6 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectContainer; import java.util.ArrayList; @@ -19,7 +21,7 @@ import java.util.ArrayList; * * Created by HellFirePvP @ 13.11.2015 00:01 */ -public class TileAuraPylonTop extends SynchronizedTileEntity { +public class TileAuraPylonTop extends SynchronizedTileEntity implements IAspectContainer { private boolean shouldRender = false; @@ -71,4 +73,48 @@ public class TileAuraPylonTop extends SynchronizedTileEntity { return true; } + @Override + public AspectList getAspects() { + TileEntity master = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + if(master == null || !(master instanceof TileAuraPylon)) return null; + return ((TileAuraPylon) master).getAspects(); + } + + @Override + public void setAspects(AspectList aspectList) {} + + @Override + public boolean doesContainerAccept(Aspect aspect) { + return false; + } + + @Override + public int addToContainer(Aspect aspect, int i) { + return 0; + } + + @Override + public boolean takeFromContainer(Aspect aspect, int i) { + return false; + } + + @Override + public boolean takeFromContainer(AspectList aspectList) { + return false; + } + + @Override + public boolean doesContainerContainAmount(Aspect aspect, int i) { + return false; + } + + @Override + public boolean doesContainerContain(AspectList aspectList) { + return false; + } + + @Override + public int containerContains(Aspect aspect) { + return 0; + } } diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/EntityAuraCore.java b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java similarity index 97% rename from src/main/java/makeo/gadomancy/common/entities/fake/EntityAuraCore.java rename to src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java index 5b99e11..ea3d12b 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/EntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java @@ -1,4 +1,4 @@ -package makeo.gadomancy.common.entities.fake; +package makeo.gadomancy.common.entities; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/EntityPermNoClipItem.java b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java similarity index 87% rename from src/main/java/makeo/gadomancy/common/entities/fake/EntityPermNoClipItem.java rename to src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java index 878da25..71d9d06 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/EntityPermNoClipItem.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java @@ -1,4 +1,4 @@ -package makeo.gadomancy.common.entities.fake; +package makeo.gadomancy.common.entities; import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.data.ModConfig; @@ -6,16 +6,19 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import thaumcraft.common.entities.EntityPermanentItem; +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 @ 16.11.2015 19:59 */ public class EntityPermNoClipItem extends EntityPermanentItem { @@ -64,17 +67,18 @@ public class EntityPermNoClipItem extends EntityPermanentItem { noClip = true; super.onUpdate(); setVelocity(0, 0, 0); - if(getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedXId).getObject() == null) return; + if (getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherFixedXId).getObject() == null) + return; float fX = getDataWatcher().getWatchableObjectFloat(ModConfig.entityNoClipItemDatawatcherFixedXId); float fY = getDataWatcher().getWatchableObjectFloat(ModConfig.entityNoClipItemDatawatcherFixedYId); float fZ = getDataWatcher().getWatchableObjectFloat(ModConfig.entityNoClipItemDatawatcherFixedZId); setPositionAndRotation(fX, fY, fZ, 0, 0); - if((ticksExisted & 7) == 0 && !worldObj.isRemote) { + if ((ticksExisted & 7) == 0 && !worldObj.isRemote) { ChunkCoordinates masterCoords = (ChunkCoordinates) getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); TileEntity te = worldObj.getTileEntity(masterCoords.posX, masterCoords.posY, masterCoords.posZ); - if(te == null || !(te instanceof TileAuraPylon) || !((TileAuraPylon) te).isMasterTile()) { + if (te == null || !(te instanceof TileAuraPylon) || !((TileAuraPylon) te).isMasterTile()) { EntityItem item = new EntityItem(worldObj, posX, posY, posZ, getEntityItem()); worldObj.spawnEntityInWorld(item); setDead(); @@ -82,6 +86,12 @@ public class EntityPermNoClipItem extends EntityPermanentItem { } } + @Override + public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_) { + this.setPosition(p_70056_1_, p_70056_3_, p_70056_5_); + this.setRotation(p_70056_7_, p_70056_8_); + } + @Override public void readEntityFromNBT(NBTTagCompound com) { super.readEntityFromNBT(com); diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java index 3d1aa6a..43f4615 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java @@ -5,11 +5,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; import makeo.gadomancy.common.data.ModConfig; -import makeo.gadomancy.common.entities.fake.EntityPermNoClipItem; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.familiar.FamiliarAIController; import makeo.gadomancy.common.utils.world.TCMazeHandler; import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -22,7 +21,6 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import thaumcraft.common.entities.EntityPermanentItem; import thaumcraft.common.items.armor.Hover; /** @@ -74,6 +72,7 @@ public class EventHandlerEntity { public void on(EntityItemPickupEvent event) { if(!event.entityPlayer.worldObj.isRemote) { if(event.item != null && event.item instanceof EntityPermNoClipItem) { + //TODO does not inform correctly? EntityPermNoClipItem item = (EntityPermNoClipItem) event.item; ChunkCoordinates master = (ChunkCoordinates) item.getDataWatcher().getWatchedObject(ModConfig.entityNoClipItemDatawatcherMasterId).getObject(); TileEntity te = event.entityPlayer.worldObj.getTileEntity(master.posX, master.posY, master.posZ); diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java index 38ccc99..8a86c87 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java @@ -61,7 +61,7 @@ public class RegisteredFamiliarAI { return; } EntityLivingBase mob = lastTargetters.get(world.rand.nextInt(lastTargetters.size())); - if(mob.isDead) { + if(mob.isDead || mob instanceof EntityPlayer) { FamiliarAIController.cleanTargetterList(parent); return; } diff --git a/src/main/java/makeo/gadomancy/common/utils/AuraEffectHandler.java b/src/main/java/makeo/gadomancy/common/utils/AuraEffectHandler.java new file mode 100644 index 0000000..d1f53ba --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/utils/AuraEffectHandler.java @@ -0,0 +1,42 @@ +package makeo.gadomancy.common.utils; + +import makeo.gadomancy.api.AuraEffect; +import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/** + * 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 @ 17.11.2015 14:06 + */ +public class AuraEffectHandler { + + public static Map registeredEffects = new HashMap(); + + //Called once every 32 ticks! + public static void distributeEffects(Aspect aspect, World worldObj, double x, double y, double z, double range) { + if(!registeredEffects.containsKey(aspect)) return; + AuraEffect effect = registeredEffects.get(aspect); + List entitiesInRange = worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(x - 0.5, y - 0.5, z - 0.5, x + 0.5, y + 0.5, z + 0.5).expand(range, range, range)); + Iterator it = entitiesInRange.iterator(); + while(it.hasNext()) { + Entity e = (Entity) it.next(); + if(e.isDead) it.remove(); + if(!effect.isEntityApplicable(e)) it.remove(); + } + for(Object e : entitiesInRange) { + effect.applyEffect((Entity) e); + } + } + +} diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 82db7d7..9af1c94 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -143,6 +143,8 @@ tile.BlockStoneMachine.3.name=Redirection Focus tile.BlockStoneMachine.4.name=Arcane Packager tile.BlockStoneMachine.11.name=Manipulation Pillar tile.BlockStoneMachine.15.name=Manipulation Pillar +tile.BlockAuraPylon.0.name=Aura Pylon +tile.BlockAuraPylon.1.name=Aura Pylon Peak gadomancy.nodes.GROWING=Growing gadomancy.nodes.STARVING=Starving