mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
More cleanup.
This commit is contained in:
1 parent
a2322d3915
commit
aa9fba46f1
10 files changed
+95
-105
No files matched your search
@@ -11,17 +11,15 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import org.lwjgl.opengl.ARBShaderObjects;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.entity.RenderBiped;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.boss.BossStatus;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.gen.structure.StructureStrongholdPieces.Stronghold.Door;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
|
||||
import org.lwjgl.opengl.ARBShaderObjects;
|
||||
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper.ShaderCallback;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
@@ -32,28 +30,28 @@ public class RenderDoppleganger extends RenderBiped {
|
||||
float disfiguration = 0.025F;
|
||||
|
||||
ShaderCallback callback = new ShaderCallback() {
|
||||
|
||||
|
||||
@Override
|
||||
public void call(int shader) {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
|
||||
ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration);
|
||||
|
||||
|
||||
// Vert Uniforms
|
||||
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
|
||||
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
public RenderDoppleganger() {
|
||||
super(new ModelBiped(0.5F), 0F);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) {
|
||||
EntityDoppleganger dopple = (EntityDoppleganger) par1Entity;
|
||||
BossStatus.setBossStatus(dopple, true);
|
||||
|
||||
|
||||
if(dopple.getInvulTime() > 0) {
|
||||
grainIntensity = dopple.getInvulTime() > 20 ? 1F : dopple.getInvulTime() * 0.05F;
|
||||
disfiguration = grainIntensity * 0.3F;
|
||||
@@ -61,7 +59,7 @@ public class RenderDoppleganger extends RenderBiped {
|
||||
disfiguration = (0.025F + dopple.hurtTime * ((1F - 0.15F) / 20F)) / 2F;
|
||||
grainIntensity = 0.05F + dopple.hurtTime * ((1F - 0.15F) / 10F);
|
||||
}
|
||||
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, callback);
|
||||
super.doRender(par1Entity, par2, par4, par6, par8, par9);
|
||||
ShaderHelper.releaseShader();
|
||||
@@ -71,5 +69,5 @@ public class RenderDoppleganger extends RenderBiped {
|
||||
protected ResourceLocation getEntityTexture(Entity par1Entity) {
|
||||
return Minecraft.getMinecraft().thePlayer.getLocationSkin();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -15,7 +15,6 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.entity.RenderLiving;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.boss.BossStatus;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.ARBShaderObjects;
|
||||
@@ -25,7 +24,6 @@ import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper.ShaderCallback;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelPixie;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
import vazkii.botania.common.entity.EntityPixie;
|
||||
|
||||
public class RenderPixie extends RenderLiving {
|
||||
|
||||
@@ -42,7 +42,7 @@ public class RenderTileMiniIsland extends TileEntitySpecialRenderer {
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
GL11.glTranslated(d0, d1, d2);
|
||||
|
||||
int worldTime = (int) (tile.getWorldObj() == null ? 0 : ClientTickHandler.ticksInGame);
|
||||
int worldTime = tile.getWorldObj() == null ? 0 : ClientTickHandler.ticksInGame;
|
||||
if(tile.getWorldObj() != null)
|
||||
worldTime += new Random(tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(1000);
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
|
||||
|
||||
private static final ResourceLocation texturePinkOld = new ResourceLocation(LibResources.MODEL_PYLON_PINK_OLD);
|
||||
private static final ResourceLocation texturePink = new ResourceLocation(LibResources.MODEL_PYLON_PINK);
|
||||
|
||||
|
||||
IPylonModel model;
|
||||
public static boolean green = false;
|
||||
public static boolean pink = false;
|
||||
@@ -63,8 +63,8 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
|
||||
if(ConfigHandler.oldPylonModel)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld);
|
||||
else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture);
|
||||
|
||||
int worldTime = (int) (tileentity.getWorldObj() == null ? 0 : ClientTickHandler.ticksInGame);
|
||||
|
||||
int worldTime = tileentity.getWorldObj() == null ? 0 : ClientTickHandler.ticksInGame;
|
||||
|
||||
if(tileentity != null)
|
||||
worldTime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360);
|
||||
|
||||
@@ -61,16 +61,16 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
private static final String TAG_REQUEST_UPDATE = "requestUpdate";
|
||||
private static final String TAG_ROTATION_X = "rotationX";
|
||||
private static final String TAG_ROTATION_Y = "rotationY";
|
||||
|
||||
|
||||
private static final String TAG_FORCE_CLIENT_BINDING_X = "forceClientBindingX";
|
||||
private static final String TAG_FORCE_CLIENT_BINDING_Y = "forceClientBindingY";
|
||||
private static final String TAG_FORCE_CLIENT_BINDING_Z = "forceClientBindingZ";
|
||||
|
||||
// Map Maker Tags
|
||||
|
||||
|
||||
private static final String TAG_INPUT_KEY = "inputKey";
|
||||
private static final String TAG_OUTPUT_KEY = "outputKey";
|
||||
|
||||
|
||||
private static final String TAG_MAPMAKER_OVERRIDE = "mapmakerOverrideEnabled";
|
||||
private static final String TAG_FORCED_COLOR = "mmForcedColor";
|
||||
private static final String TAG_FORCED_MANA_PAYLOAD = "mmForcedManaPayload";
|
||||
@@ -78,7 +78,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
private static final String TAG_FORCED_MANA_LOSS_PER_TICK = "mmForcedManaLossPerTick";
|
||||
private static final String TAG_FORCED_GRAVITY = "mmForcedGravity";
|
||||
private static final String TAG_FORCED_VELOCITY_MULTIPLIER = "mmForcedVelocityMultiplier";
|
||||
|
||||
|
||||
boolean mapmakerOverride = false;
|
||||
int mmForcedColor = 0x20FF20;
|
||||
int mmForcedManaPayload = 160;
|
||||
@@ -89,9 +89,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
String inputKey = "";
|
||||
String outputKey = "";
|
||||
|
||||
|
||||
// End Map Maker Tags
|
||||
|
||||
|
||||
public static boolean staticRedstone = false;
|
||||
public static boolean staticDreamwood = false;
|
||||
|
||||
@@ -148,7 +148,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
if(pool != receiver) {
|
||||
if(pool instanceof IKeyLocked && !((IKeyLocked) pool).getOutputKey().equals(getInputKey()))
|
||||
continue;
|
||||
|
||||
|
||||
int manaInPool = pool.getCurrentMana();
|
||||
if(manaInPool > 0 && !isFull()) {
|
||||
int manaMissing = MAX_MANA - mana;
|
||||
@@ -174,7 +174,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
if(shouldShoot && receiver != null && receiver instanceof IKeyLocked)
|
||||
shouldShoot = ((IKeyLocked) receiver).getInputKey().equals(getOutputKey());
|
||||
|
||||
|
||||
if(shouldShoot)
|
||||
tryShootBurst();
|
||||
|
||||
@@ -194,14 +194,14 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
cmp.setFloat(TAG_ROTATION_X, rotationX);
|
||||
cmp.setFloat(TAG_ROTATION_Y, rotationY);
|
||||
cmp.setBoolean(TAG_REQUEST_UPDATE, requestsClientUpdate);
|
||||
|
||||
|
||||
cmp.setString(TAG_INPUT_KEY, inputKey);
|
||||
cmp.setString(TAG_OUTPUT_KEY, outputKey);
|
||||
|
||||
cmp.setInteger(TAG_FORCE_CLIENT_BINDING_X, receiver == null ? 0 : ((TileEntity) receiver).xCoord);
|
||||
cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Y, receiver == null ? -1 : ((TileEntity) receiver).yCoord);
|
||||
cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Z, receiver == null ? 0 : ((TileEntity) receiver).zCoord);
|
||||
|
||||
|
||||
cmp.setBoolean(TAG_MAPMAKER_OVERRIDE, mapmakerOverride);
|
||||
cmp.setInteger(TAG_FORCED_COLOR, mmForcedColor);
|
||||
cmp.setInteger(TAG_FORCED_MANA_PAYLOAD, mmForcedManaPayload);
|
||||
@@ -220,7 +220,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
rotationX = cmp.getFloat(TAG_ROTATION_X);
|
||||
rotationY = cmp.getFloat(TAG_ROTATION_Y);
|
||||
requestsClientUpdate = cmp.getBoolean(TAG_REQUEST_UPDATE);
|
||||
|
||||
|
||||
if(cmp.hasKey(TAG_INPUT_KEY))
|
||||
inputKey = cmp.getString(TAG_INPUT_KEY);
|
||||
if(cmp.hasKey(TAG_OUTPUT_KEY))
|
||||
|
||||
@@ -45,21 +45,15 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
|
||||
private static final float MAX_HP = 200F;
|
||||
|
||||
private static final String TAG_SOURCE_X = "sourceX";
|
||||
private static final String TAG_SOURCE_Y = "sourceY";
|
||||
private static final String TAG_SOURCE_Z = "sourceZ";
|
||||
|
||||
private static final String TAG_INVUL_TIME = "invulTime";
|
||||
private static final String TAG_AGGRO = "aggro";
|
||||
private static final String TAG_TP_DELAY = "tpDelay";
|
||||
|
||||
private static final int[][] PYLON_LOCATIONS = new int[][] {
|
||||
{ 4, 1, 4 },
|
||||
{ 4, 1, -4 },
|
||||
{ -4, 1, 4 },
|
||||
{ -4, 1, -4 }
|
||||
};
|
||||
|
||||
|
||||
boolean spawnLandmines = false;
|
||||
boolean spawnPixies = false;
|
||||
|
||||
@@ -72,7 +66,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
isImmuneToFire = true;
|
||||
experienceValue = 825;
|
||||
}
|
||||
|
||||
|
||||
public static boolean spawn(ItemStack par1ItemStack, World par3World, int par4, int par5, int par6) {
|
||||
Block block = par3World.getBlock(par4, par5, par6);
|
||||
if(block == Blocks.beacon && !par3World.isRemote) {
|
||||
@@ -86,7 +80,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
if(blockat != ModBlocks.pylon || meta != 2)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
par1ItemStack.stackSize--;
|
||||
EntityDoppleganger e = new EntityDoppleganger(par3World);
|
||||
e.setPosition(par4 + 0.5, par5 + 3, par6 + 0.5);
|
||||
@@ -127,7 +121,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
public int getTPDelay() {
|
||||
return dataWatcher.getWatchableObjectInt(22);
|
||||
}
|
||||
|
||||
|
||||
public ChunkCoordinates getSource() {
|
||||
int x = dataWatcher.getWatchableObjectInt(23);
|
||||
int y = dataWatcher.getWatchableObjectInt(24);
|
||||
@@ -146,7 +140,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
public void setTPDelay(int delay) {
|
||||
dataWatcher.updateObject(22, delay);
|
||||
}
|
||||
|
||||
|
||||
public void setSource(int x, int y, int z) {
|
||||
dataWatcher.updateObject(23, x);
|
||||
dataWatcher.updateObject(24, y);
|
||||
@@ -178,12 +172,12 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
protected void damageEntity(DamageSource par1DamageSource, float par2) {
|
||||
super.damageEntity(par1DamageSource, par2);
|
||||
|
||||
Entity attacker = par1DamageSource.getEntity();
|
||||
Entity attacker = par1DamageSource.getEntity();
|
||||
if(attacker != null) {
|
||||
Vector3 thisVector = Vector3.fromEntityCenter(this);
|
||||
Vector3 playerVector = Vector3.fromEntityCenter(attacker);
|
||||
Vector3 motionVector = thisVector.copy().sub(playerVector).copy().normalize().multiply(0.75);
|
||||
|
||||
|
||||
if(getHealth() > 0) {
|
||||
motionX = -motionVector.x;
|
||||
motionY = 0.5;
|
||||
@@ -191,7 +185,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
setTPDelay(4);
|
||||
spawnPixies = isAggored();
|
||||
}
|
||||
|
||||
|
||||
setAggroed(true);
|
||||
}
|
||||
}
|
||||
@@ -208,13 +202,13 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
protected boolean canDespawn() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void dropFewItems(boolean par1, int par2) {
|
||||
if(par1)
|
||||
if(par1)
|
||||
entityDropItem(new ItemStack(ModItems.manaResource, 12, 5), 1F);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onLivingUpdate() {
|
||||
super.onLivingUpdate();
|
||||
@@ -222,10 +216,10 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
|
||||
float range = 32F;
|
||||
List<EntityPlayer> players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range));
|
||||
|
||||
|
||||
range = 12F;
|
||||
List<EntityPlayer> playersInside = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range));
|
||||
|
||||
|
||||
if(players.isEmpty())
|
||||
setDead();
|
||||
else for(EntityPlayer player : players) {
|
||||
@@ -234,30 +228,30 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
for(PotionEffect effect : active)
|
||||
if(effect.getDuration() < 200 && !ReflectionHelper.<Boolean, Potion>getPrivateValue(Potion.class, Potion.potionTypes[effect.getPotionID()], LibObfuscation.IS_BAD_EFFECT))
|
||||
remove.add(effect);
|
||||
|
||||
|
||||
active.removeAll(remove);
|
||||
|
||||
|
||||
if(!playersInside.contains(player)) {
|
||||
Vector3 sourceVector = new Vector3(source.posX + 0.5, source.posY + 0.5, source.posZ + 0.5);
|
||||
Vector3 playerVector = Vector3.fromEntityCenter(player);
|
||||
Vector3 motion = sourceVector.copy().sub(playerVector).copy().normalize();
|
||||
|
||||
|
||||
player.motionX = motion.x;
|
||||
player.motionY = 0.2;
|
||||
player.motionZ = motion.z;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(isDead)
|
||||
return;
|
||||
|
||||
|
||||
int invul = getInvulTime();
|
||||
if(invul > 0) {
|
||||
if(invul < SPAWN_TICKS && invul > SPAWN_TICKS / 2 && worldObj.rand.nextInt(SPAWN_TICKS - invul + 1) == 0)
|
||||
for(int i = 0; i < 2; i++)
|
||||
spawnExplosionParticle();
|
||||
|
||||
setHealth(getHealth() + ((MAX_HP - 1F) / SPAWN_TICKS));
|
||||
setHealth(getHealth() + (MAX_HP - 1F) / SPAWN_TICKS);
|
||||
setInvulTime(invul - 1);
|
||||
motionY = 0;
|
||||
} else {
|
||||
@@ -268,16 +262,16 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
while(!teleportRandomly());
|
||||
if(spawnLandmines && !worldObj.isRemote)
|
||||
for(int i = 0; i < 6; i++) {
|
||||
int x = source.posX - 10 + rand.nextInt(20);
|
||||
int z = source.posZ - 10 + rand.nextInt(20);
|
||||
int x = source.posX - 10 + rand.nextInt(20);
|
||||
int z = source.posZ - 10 + rand.nextInt(20);
|
||||
int y = worldObj.getTopSolidOrLiquidBlock(x, z);
|
||||
|
||||
|
||||
EntityMagicLandmine landmine = new EntityMagicLandmine(worldObj);
|
||||
landmine.setPosition(x + 0.5, y, z + 0.5);
|
||||
landmine.summoner = this;
|
||||
worldObj.spawnEntityInWorld(landmine);
|
||||
}
|
||||
|
||||
|
||||
if(!worldObj.isRemote)
|
||||
for(int i = 0; i < (spawnPixies ? worldObj.rand.nextInt(3) : 1); i++) {
|
||||
EntityPixie pixie = new EntityPixie(worldObj);
|
||||
@@ -285,7 +279,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2);
|
||||
worldObj.spawnEntityInWorld(pixie);
|
||||
}
|
||||
|
||||
|
||||
setTPDelay(50);
|
||||
spawnLandmines = true;
|
||||
spawnPixies = false;
|
||||
@@ -301,46 +295,46 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
}
|
||||
|
||||
// EntityEnderman code below ============================================================================
|
||||
|
||||
|
||||
protected boolean teleportRandomly() {
|
||||
double d0 = this.posX + (this.rand.nextDouble() - 0.5D) * 64.0D;
|
||||
double d1 = this.posY + (double)(this.rand.nextInt(64) - 32);
|
||||
double d2 = this.posZ + (this.rand.nextDouble() - 0.5D) * 64.0D;
|
||||
return this.teleportTo(d0, d1, d2);
|
||||
double d0 = posX + (rand.nextDouble() - 0.5D) * 64.0D;
|
||||
double d1 = posY + (rand.nextInt(64) - 32);
|
||||
double d2 = posZ + (rand.nextDouble() - 0.5D) * 64.0D;
|
||||
return teleportTo(d0, d1, d2);
|
||||
}
|
||||
|
||||
protected boolean teleportTo(double par1, double par3, double par5) {
|
||||
double d3 = this.posX;
|
||||
double d4 = this.posY;
|
||||
double d5 = this.posZ;
|
||||
this.posX = par1;
|
||||
this.posY = par3;
|
||||
this.posZ = par5;
|
||||
double d3 = posX;
|
||||
double d4 = posY;
|
||||
double d5 = posZ;
|
||||
posX = par1;
|
||||
posY = par3;
|
||||
posZ = par5;
|
||||
boolean flag = false;
|
||||
int i = MathHelper.floor_double(this.posX);
|
||||
int j = MathHelper.floor_double(this.posY);
|
||||
int k = MathHelper.floor_double(this.posZ);
|
||||
int i = MathHelper.floor_double(posX);
|
||||
int j = MathHelper.floor_double(posY);
|
||||
int k = MathHelper.floor_double(posZ);
|
||||
|
||||
if(this.worldObj.blockExists(i, j, k)) {
|
||||
if(worldObj.blockExists(i, j, k)) {
|
||||
boolean flag1 = false;
|
||||
|
||||
while(!flag1 && j > 0) {
|
||||
Block block = this.worldObj.getBlock(i, j - 1, k);
|
||||
Block block = worldObj.getBlock(i, j - 1, k);
|
||||
|
||||
if(block.getMaterial().blocksMovement())
|
||||
flag1 = true;
|
||||
else {
|
||||
--this.posY;
|
||||
--posY;
|
||||
--j;
|
||||
}
|
||||
}
|
||||
|
||||
if(flag1) {
|
||||
this.setPosition(this.posX, this.posY, this.posZ);
|
||||
setPosition(posX, posY, posZ);
|
||||
|
||||
if(this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox))
|
||||
if(worldObj.getCollidingBoundingBoxes(this, boundingBox).isEmpty() && !worldObj.isAnyLiquid(boundingBox))
|
||||
flag = true;
|
||||
|
||||
|
||||
// Prevent out of bounds teleporting
|
||||
ChunkCoordinates source = getSource();
|
||||
if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.posX, source.posY, source.posZ) > 15)
|
||||
@@ -349,24 +343,24 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa
|
||||
}
|
||||
|
||||
if (!flag) {
|
||||
this.setPosition(d3, d4, d5);
|
||||
setPosition(d3, d4, d5);
|
||||
return false;
|
||||
} else {
|
||||
short short1 = 128;
|
||||
|
||||
for(int l = 0; l < short1; ++l) {
|
||||
double d6 = (double)l / ((double)short1 - 1.0D);
|
||||
float f = (this.rand.nextFloat() - 0.5F) * 0.2F;
|
||||
float f1 = (this.rand.nextFloat() - 0.5F) * 0.2F;
|
||||
float f2 = (this.rand.nextFloat() - 0.5F) * 0.2F;
|
||||
double d7 = d3 + (this.posX - d3) * d6 + (this.rand.nextDouble() - 0.5D) * (double)this.width * 2.0D;
|
||||
double d8 = d4 + (this.posY - d4) * d6 + this.rand.nextDouble() * (double)this.height;
|
||||
double d9 = d5 + (this.posZ - d5) * d6 + (this.rand.nextDouble() - 0.5D) * (double)this.width * 2.0D;
|
||||
this.worldObj.spawnParticle("portal", d7, d8, d9, (double)f, (double)f1, (double)f2);
|
||||
double d6 = l / (short1 - 1.0D);
|
||||
float f = (rand.nextFloat() - 0.5F) * 0.2F;
|
||||
float f1 = (rand.nextFloat() - 0.5F) * 0.2F;
|
||||
float f2 = (rand.nextFloat() - 0.5F) * 0.2F;
|
||||
double d7 = d3 + (posX - d3) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D;
|
||||
double d8 = d4 + (posY - d4) * d6 + rand.nextDouble() * height;
|
||||
double d9 = d5 + (posZ - d5) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D;
|
||||
worldObj.spawnParticle("portal", d7, d8, d9, f, f1, f2);
|
||||
}
|
||||
|
||||
this.worldObj.playSoundEffect(d3, d4, d5, "mob.endermen.portal", 1.0F, 1.0F);
|
||||
this.playSound("mob.endermen.portal", 1.0F, 1.0F);
|
||||
worldObj.playSoundEffect(d3, d4, d5, "mob.endermen.portal", 1.0F, 1.0F);
|
||||
playSound("mob.endermen.portal", 1.0F, 1.0F);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,32 +26,32 @@ import vazkii.botania.common.Botania;
|
||||
public class EntityMagicLandmine extends Entity {
|
||||
|
||||
public EntityDoppleganger summoner;
|
||||
|
||||
|
||||
public EntityMagicLandmine(World par1World) {
|
||||
super(par1World);
|
||||
setSize(0F, 0F);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
motionX = 0;
|
||||
motionY = 0;
|
||||
motionZ = 0;
|
||||
super.onUpdate();
|
||||
|
||||
|
||||
float range = 2.5F;
|
||||
|
||||
|
||||
float r = 0.2F;
|
||||
float g = 0F;
|
||||
float b = 0.2F;
|
||||
|
||||
|
||||
Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.6F, -0.2F, 1);
|
||||
for(int i = 0; i < 4; i++)
|
||||
Botania.proxy.wispFX(worldObj, posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.06F, 1);
|
||||
|
||||
if(ticksExisted >= 45) {
|
||||
worldObj.playSoundEffect(posX, posY, posZ, "random.explode", 0.6F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 1.4F);
|
||||
|
||||
|
||||
float m = 0.35F;
|
||||
g = 0.4F;
|
||||
for(int i = 0; i < 25; i++)
|
||||
@@ -65,7 +65,7 @@ public class EntityMagicLandmine extends Entity {
|
||||
player.addPotionEffect(new PotionEffect(Potion.wither.id, 60, 3));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
setDead();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,28 +27,28 @@ public class EntityPixie extends EntityFlyingCreature {
|
||||
super(world);
|
||||
setSize(1.0F, 1.0F);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void entityInit() {
|
||||
super.entityInit();
|
||||
dataWatcher.addObject(20, 0);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void applyEntityAttributes() {
|
||||
super.applyEntityAttributes();
|
||||
getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(2.0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setType(int type) {
|
||||
dataWatcher.updateObject(20, type);
|
||||
}
|
||||
|
||||
|
||||
public int getType() {
|
||||
return dataWatcher.getWatchableObjectInt(20);
|
||||
}
|
||||
|
||||
|
||||
public void setProps(EntityLivingBase target, EntityLivingBase summoner, int type, float damage) {
|
||||
setAttackTarget(target);
|
||||
this.summoner = summoner;
|
||||
@@ -68,7 +68,7 @@ public class EntityPixie extends EntityFlyingCreature {
|
||||
float mod = 0.45F;
|
||||
if(getType() == 1)
|
||||
mod = 0.1F;
|
||||
|
||||
|
||||
motionX += d0 / d3 * mod;
|
||||
motionY += d1 / d3 * mod;
|
||||
motionZ += d2 / d3 * mod;
|
||||
|
||||
@@ -54,7 +54,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
|
||||
String type = getType(stack);
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileSpecialFlower) {
|
||||
TileSpecialFlower tile = (TileSpecialFlower) te;
|
||||
TileSpecialFlower tile = (TileSpecialFlower) te;
|
||||
tile.setSubTile(type);
|
||||
if(!world.isRemote)
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
|
||||
@@ -506,7 +506,7 @@ public final class LexiconData {
|
||||
gaiaRitual = new ALexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy);
|
||||
gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGaiaPylon), new PageImage("2", LibResources.ENTRY_GAIA_RITUAL), new PageText("3"), new PageText("4"));
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 5), gaiaRitual, 0);
|
||||
|
||||
|
||||
// MISCLENAEOUS ENTRIES
|
||||
unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc);
|
||||
unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares));
|
||||
|
||||
Reference in new issue
Block a user