forked from ACGaming/Spackenmobs
Particle fixes
This commit is contained in:
parent
5d8cc3b20d
commit
5e1bd6d4b1
3 changed files with 13 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -22,3 +22,4 @@ eclipse
|
||||||
run
|
run
|
||||||
build.bat
|
build.bat
|
||||||
runClient.bat
|
runClient.bat
|
||||||
|
runServer.bat
|
||||||
|
|
|
@ -13,10 +13,7 @@ import net.minecraft.init.Items;
|
||||||
import net.minecraft.init.SoundEvents;
|
import net.minecraft.init.SoundEvents;
|
||||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.DamageSource;
|
import net.minecraft.util.*;
|
||||||
import net.minecraft.util.EnumHand;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraft.util.SoundEvent;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.village.MerchantRecipe;
|
import net.minecraft.village.MerchantRecipe;
|
||||||
import net.minecraft.village.MerchantRecipeList;
|
import net.minecraft.village.MerchantRecipeList;
|
||||||
|
@ -29,6 +26,7 @@ public class EntityFriedrichLiechtenstein extends EntityCreature implements IMer
|
||||||
super(worldIn);
|
super(worldIn);
|
||||||
setSize(0.6F, 1.8F);
|
setSize(0.6F, 1.8F);
|
||||||
setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(ModItems.AHOJ_BRAUSE));
|
setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(ModItems.AHOJ_BRAUSE));
|
||||||
|
setItemStackToSlot(EntityEquipmentSlot.OFFHAND, new ItemStack(ModItems.AHOJ_BRAUSE_DRINK));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -60,6 +58,13 @@ public class EntityFriedrichLiechtenstein extends EntityCreature implements IMer
|
||||||
{
|
{
|
||||||
player.playSound(ModSoundEvents.ENTITY_FRIEDRICH_DEATH, 1.0F, 1.0F);
|
player.playSound(ModSoundEvents.ENTITY_FRIEDRICH_DEATH, 1.0F, 1.0F);
|
||||||
player.playSound(SoundEvents.ENTITY_COW_MILK, 1.0F, 1.0F);
|
player.playSound(SoundEvents.ENTITY_COW_MILK, 1.0F, 1.0F);
|
||||||
|
for (int i = 0; i < 7; ++i)
|
||||||
|
{
|
||||||
|
double d0 = this.rand.nextGaussian() * 0.02D;
|
||||||
|
double d1 = this.rand.nextGaussian() * 0.02D;
|
||||||
|
double d2 = this.rand.nextGaussian() * 0.02D;
|
||||||
|
this.world.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, this.posX + this.rand.nextFloat() * this.width * 2.0F - this.width, this.posY + 0.5D + this.rand.nextFloat() * this.height, this.posZ + this.rand.nextFloat() * this.width * 2.0F - this.width, d0, d1, d2);
|
||||||
|
}
|
||||||
itemstack.shrink(1);
|
itemstack.shrink(1);
|
||||||
|
|
||||||
if (itemstack.isEmpty())
|
if (itemstack.isEmpty())
|
||||||
|
|
|
@ -38,10 +38,9 @@ public class EntityJens extends EntityPig
|
||||||
|
|
||||||
private static final Set<Item> TEMPTATION_ITEMS = Sets.newHashSet(ModItems.RAM);
|
private static final Set<Item> TEMPTATION_ITEMS = Sets.newHashSet(ModItems.RAM);
|
||||||
private static final Set<Item> FISH_ITEMS = Sets.newHashSet(Items.FISH);
|
private static final Set<Item> FISH_ITEMS = Sets.newHashSet(Items.FISH);
|
||||||
|
|
||||||
public boolean digesting;
|
public boolean digesting;
|
||||||
public int digestTime;
|
public int digestTime;
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
Minecraft MINECRAFT = Minecraft.getMinecraft();
|
|
||||||
|
|
||||||
public EntityJens(World worldIn)
|
public EntityJens(World worldIn)
|
||||||
{
|
{
|
||||||
|
@ -93,8 +92,7 @@ public class EntityJens extends EntityPig
|
||||||
double d0 = this.rand.nextGaussian() * 0.02D;
|
double d0 = this.rand.nextGaussian() * 0.02D;
|
||||||
double d1 = this.rand.nextGaussian() * 0.02D;
|
double d1 = this.rand.nextGaussian() * 0.02D;
|
||||||
double d2 = this.rand.nextGaussian() * 0.02D;
|
double d2 = this.rand.nextGaussian() * 0.02D;
|
||||||
MINECRAFT.world.spawnParticle(EnumParticleTypes.HEART, this.posX + this.rand.nextFloat() * this.width * 2.0F - this.width, this.posY + 0.5D + this.rand.nextFloat() * this.height,
|
this.world.spawnParticle(EnumParticleTypes.HEART, this.posX + this.rand.nextFloat() * this.width * 2.0F - this.width, this.posY + 0.5D + this.rand.nextFloat() * this.height, this.posZ + this.rand.nextFloat() * this.width * 2.0F - this.width, d0, d1, d2);
|
||||||
this.posZ + this.rand.nextFloat() * this.width * 2.0F - this.width, d0, d1, d2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, ModConfigs.Jens_digest_time * 20));
|
this.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, ModConfigs.Jens_digest_time * 20));
|
||||||
|
@ -179,8 +177,7 @@ public class EntityJens extends EntityPig
|
||||||
double d0 = this.rand.nextGaussian() * 0.02D;
|
double d0 = this.rand.nextGaussian() * 0.02D;
|
||||||
double d1 = this.rand.nextGaussian() * 0.02D;
|
double d1 = this.rand.nextGaussian() * 0.02D;
|
||||||
double d2 = this.rand.nextGaussian() * 0.02D;
|
double d2 = this.rand.nextGaussian() * 0.02D;
|
||||||
MINECRAFT.world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, this.posX + this.rand.nextFloat() * this.width * 2.0F - this.width, this.posY + 0.5D + this.rand.nextFloat() * this.height,
|
this.world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, this.posX + this.rand.nextFloat() * this.width * 2.0F - this.width, this.posY + 0.5D + this.rand.nextFloat() * this.height, this.posZ + this.rand.nextFloat() * this.width * 2.0F - this.width, d0, d1, d2);
|
||||||
this.posZ + this.rand.nextFloat() * this.width * 2.0F - this.width, d0, d1, d2);
|
|
||||||
}
|
}
|
||||||
this.playSound(ModSoundEvents.ENTITY_JENS_POOP, 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
|
this.playSound(ModSoundEvents.ENTITY_JENS_POOP, 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F);
|
||||||
this.dropItem(ModItems.SURSTROEMMING, 1);
|
this.dropItem(ModItems.SURSTROEMMING, 1);
|
||||||
|
|
Loading…
Reference in a new issue