Merge branch 'dev' of D:\Dateien\modding\1.7.10\Gadomancy with conflicts.

This commit is contained in:
makeo committed 2015-12-13 18:07:46 +01:00
1 parent 4730d251a1
commit 199fa7e893
3 files changed
+45 -6

No files matched your search

@@ -399,7 +399,7 @@ public class AuraEffects {
}
}
}.register(Aspect.FIRE);
public static final AuraEffect ALIENIS = new AuraEffect.EntityAuraEffect() {
public static final AuraEffect ELDRITCH = new AuraEffect.EntityAuraEffect() {
@Override
public boolean isEntityApplicable(Entity e) {
if(e instanceof EntityMob) {
@@ -433,12 +433,12 @@ public class AuraEffects {
EntityUtils.makeChampion(mob, false);
mob.removePotionEffect(RegisteredPotions.ELDRITCH.getId());
} else {
mob.addPotionEffect(new PotionEffect(RegisteredPotions.ELDRITCH.getId(), ticksForMinutes(5), effect == null ? 1 : effect.getAmplifier() + 1));
mob.addPotionEffect(new PotionEffect(RegisteredPotions.ELDRITCH.getId(), MiscUtils.ticksForMinutes(1), effect == null ? 1 : effect.getAmplifier() + 1));
}
}
}
}.register(Aspect.ELDRITCH);
public static final AuraEffect SPIRITUS = new AuraEffect.BlockAuraEffect() {
public static final AuraEffect SOUL = new AuraEffect.BlockAuraEffect() {
@Override
public int getBlockCount(Random random) {
return random.nextInt(60) == 0 ? 1 : 0;
@@ -467,7 +467,7 @@ public class AuraEffects {
}
}
} while (totalCount > 0);
mob.addPotionEffect(new PotionEffect(Potion.invisibility.getId(), ticksForDays(365), 1, true));
mob.addPotionEffect(new PotionEffect(Potion.invisibility.getId(), MiscUtils.ticksForMinutes(60*24*365), 1, true));
ChunkCoordinates pos = new ChunkCoordinates((int) mob.posX, (int) mob.posY, (int) mob.posZ);
pos = iterateDown(pos, world);
@@ -0,0 +1,39 @@
package makeo.gadomancy.common.entities.player;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import java.util.UUID;
/**
* 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
* <p/>
* Created by makeo @ 06.12.2015 01:01
*/
public class FakePlayerEntity extends EntityPlayer {
public FakePlayerEntity(World world) {
super(world, new GameProfile(UUID.fromString("d36a4fa5-c70e-4358-8418-9ed683687d0a"), "bla"));
}
@Override
public void addChatMessage(IChatComponent component) {
}
@Override
public boolean canCommandSenderUseCommand(int p_70003_1_, String p_70003_2_) {
return false;
}
@Override
public ChunkCoordinates getPlayerCoordinates() {
return new ChunkCoordinates(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY + 0.5D), MathHelper.floor_double(this.posZ));
}
}
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.EntityRegistry;
import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.entities.EntityAuraCore;
import makeo.gadomancy.common.entities.EntityPermNoClipItem;
import makeo.gadomancy.common.entities.player.FakePlayerEntity;
import net.minecraft.entity.Entity;
/**
@@ -19,6 +20,7 @@ public class RegisteredEntities {
public static void init() {
registerEntity(EntityPermNoClipItem.class, "EntityPermItem", 32, 40, false);
registerEntity(EntityAuraCore.class, "EntityAuraCore", 32, 10, true);
registerEntity(FakePlayerEntity.class, "FakePlayerEntity", 32, 20, true);
}
private static void registerEntity(Class<? extends Entity> entityClass, String name, int trackingRange, int updateFreq, boolean sendVelUpdates) {
@@ -26,6 +28,4 @@ public class RegisteredEntities {
EntityRegistry.registerGlobalEntityID(entityClass, name, id);
EntityRegistry.registerModEntity(entityClass, name, id, Gadomancy.instance, trackingRange, updateFreq, sendVelUpdates);
}
}