Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Smart Feeder Fixes #1017

Browse source
This commit is contained in:
Shadows_of_Fire 2018-01-29 03:17:38 -05:00
parent 227c227ddd
commit 00e99d3611
1 changed files with 42 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java
View file

@ -10,7 +10,9 @@
package de.ellpeck.actuallyadditions.mod.tile; package de.ellpeck.actuallyadditions.mod.tile;
import de.ellpeck.actuallyadditions.mod.util.StackUtil; import java.util.List;
import java.util.Optional;
import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -19,10 +21,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.fml.relauncher.Side; import net.minecraft.util.math.MathHelper;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class TileEntityFeeder extends TileEntityInventoryBase{ public class TileEntityFeeder extends TileEntityInventoryBase{
@ -37,7 +36,6 @@ public class TileEntityFeeder extends TileEntityInventoryBase{
super(1, "feeder"); super(1, "feeder");
} }
@SideOnly(Side.CLIENT)
public int getCurrentTimerToScale(int i){ public int getCurrentTimerToScale(int i){
return this.currentTimer*i/TIME; return this.currentTimer*i/TIME;
} }
@ -63,59 +61,33 @@ public class TileEntityFeeder extends TileEntityInventoryBase{
@Override @Override
public void updateEntity(){ public void updateEntity(){
super.updateEntity(); super.updateEntity();
if(!this.world.isRemote){ currentTimer = MathHelper.clamp(++currentTimer, 0, 100);
boolean theFlag = this.currentTimer > 0; if(world.isRemote) return;
int range = 5; boolean theFlag = this.currentTimer > 0;
List<EntityAnimal> animals = this.world.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(this.pos.getX()-range, this.pos.getY()-range, this.pos.getZ()-range, this.pos.getX()+range, this.pos.getY()+range, this.pos.getZ()+range)); int range = 5;
if(animals != null){ ItemStack stack = this.slots.getStackInSlot(0);
this.currentAnimalAmount = animals.size(); if(!stack.isEmpty() && this.currentTimer >= TIME) {
if(this.currentAnimalAmount >= 2){ List<EntityAnimal> animals = this.world.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(this.pos.getX()-range, this.pos.getY()-range, this.pos.getZ()-range, this.pos.getX()+range, this.pos.getY()+range, this.pos.getZ()+range));
if(this.currentAnimalAmount < THRESHOLD){ this.currentAnimalAmount = animals.size();
if(this.currentTimer >= TIME){ if(currentAnimalAmount >= 2 && currentAnimalAmount < THRESHOLD){
this.currentTimer = 0; Optional<EntityAnimal> opt = animals.stream().filter((e) -> canBeFed(stack, e)).findAny();
if(StackUtil.isValid(this.slots.getStackInSlot(0))){ if(opt.isPresent()) {
EntityAnimal randomAnimal = animals.get(this.world.rand.nextInt(this.currentAnimalAmount)); EntityAnimal animal = opt.get();
if(!randomAnimal.isInLove() && randomAnimal.getGrowingAge() == 0 && (randomAnimal.isBreedingItem(this.slots.getStackInSlot(0)) || this.canHorseBeFed(randomAnimal))){ feedAnimal(animal);
stack.shrink(1);
this.feedAnimal(randomAnimal); this.currentTimer = 0;
}
this.slots.setStackInSlot(0, StackUtil.addStackSize(this.slots.getStackInSlot(0), -1));
}
}
}
else{
this.currentTimer++;
}
}
else{
this.currentTimer = 0;
}
}
else{
this.currentTimer = 0;
}
} }
}
if(theFlag != this.currentTimer > 0){ if(theFlag != this.currentTimer > 0){
this.markDirty(); this.markDirty();
}
if((this.lastAnimalAmount != this.currentAnimalAmount || this.lastTimer != this.currentTimer) && this.sendUpdateWithInterval()){
this.lastAnimalAmount = this.currentAnimalAmount;
this.lastTimer = this.currentTimer;
}
} }
}
private boolean canHorseBeFed(EntityAnimal animal){ if((this.lastAnimalAmount != this.currentAnimalAmount || this.lastTimer != this.currentTimer) && this.sendUpdateWithInterval()){
if(animal instanceof EntityHorse){ this.lastAnimalAmount = this.currentAnimalAmount;
EntityHorse horse = (EntityHorse)animal; this.lastTimer = this.currentTimer;
if(horse.isTame()){
Item item = this.slots.getStackInSlot(0).getItem();
return item == Items.GOLDEN_APPLE || item == Items.GOLDEN_CARROT;
}
} }
return false;
} }
@Override @Override
@ -123,18 +95,29 @@ public class TileEntityFeeder extends TileEntityInventoryBase{
return true; return true;
} }
public void feedAnimal(EntityAnimal animal){ @Override
public boolean canExtractItem(int slot, ItemStack stack){
return false;
}
private static void feedAnimal(EntityAnimal animal){
animal.setInLove(null); animal.setInLove(null);
for(int i = 0; i < 7; i++){ for(int i = 0; i < 7; i++){
double d = animal.world.rand.nextGaussian()*0.02D; double d = animal.world.rand.nextGaussian()*0.02D;
double d1 = animal.world.rand.nextGaussian()*0.02D; double d1 = animal.world.rand.nextGaussian()*0.02D;
double d2 = animal.world.rand.nextGaussian()*0.02D; double d2 = animal.world.rand.nextGaussian()*0.02D;
this.world.spawnParticle(EnumParticleTypes.HEART, (animal.posX+(double)(animal.world.rand.nextFloat()*animal.width*2.0F))-animal.width, animal.posY+0.5D+(double)(animal.world.rand.nextFloat()*animal.height), (animal.posZ+(double)(animal.world.rand.nextFloat()*animal.width*2.0F))-animal.width, d, d1, d2); animal.world.spawnParticle(EnumParticleTypes.HEART, (animal.posX+(double)(animal.world.rand.nextFloat()*animal.width*2.0F))-animal.width, animal.posY+0.5D+(double)(animal.world.rand.nextFloat()*animal.height), (animal.posZ+(double)(animal.world.rand.nextFloat()*animal.width*2.0F))-animal.width, d, d1, d2);
} }
} }
@Override private static boolean canBeFed(ItemStack stack, EntityAnimal animal){
public boolean canExtractItem(int slot, ItemStack stack){ if(animal instanceof EntityHorse){
return false; EntityHorse horse = (EntityHorse)animal;
if(horse.isTame()){
Item item = stack.getItem();
return item == Items.GOLDEN_APPLE || item == Items.GOLDEN_CARROT;
}
}
return animal.getGrowingAge() == 0 && !animal.isInLove() && animal.isBreedingItem(stack);
} }
} }