lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Satiated Stomach will now let you gorge yourself if you're really hungry (#1188)

Browse source 
If the user is below 5 saturation, it will no longer ignore above-max saturation
foods.
This commit is contained in:
Nicholas Ignoffo 2018-02-17 15:50:11 -08:00
parent 6ffe4b8f58
commit 0cb9d66c81
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java
View file

@ -11,6 +11,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.FoodStats; import net.minecraft.util.FoodStats;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -40,37 +42,32 @@ public class RitualFullStomach extends Ritual {
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = getBlockRange(CHEST_RANGE);
TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0));
if (!(tile instanceof IInventory)) { if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null))
return; return;
}
IInventory inventory = (IInventory) tile;
IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
int lastSlot = 0; int lastSlot = 0;
AreaDescriptor fillingRange = getBlockRange(FILL_RANGE); AreaDescriptor fillingRange = getBlockRange(FILL_RANGE);
List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos)); List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos));
for (EntityPlayer player : playerList) { for (EntityPlayer player : playerList) {
FoodStats foodStats = player.getFoodStats(); FoodStats foodStats = player.getFoodStats();
float satLevel = foodStats.getSaturationLevel(); float satLevel = foodStats.getSaturationLevel();
for (int i = lastSlot; i < inventory.getSizeInventory(); i++) { for (int i = lastSlot; i < inventory.getSlots(); i++) {
ItemStack stack = inventory.getStackInSlot(i); ItemStack stack = inventory.extractItem(i, 1, true);
if (!stack.isEmpty() && stack.getItem() instanceof ItemFood) { if (!stack.isEmpty() && stack.getItem() instanceof ItemFood) {
ItemFood foodItem = (ItemFood) stack.getItem(); ItemFood foodItem = (ItemFood) stack.getItem();
int healAmount = foodItem.getHealAmount(stack); int healAmount = foodItem.getHealAmount(stack);
float saturationAmount = foodItem.getSaturationModifier(stack) * healAmount * 2.0f; float saturationAmount = foodItem.getSaturationModifier(stack) * healAmount * 2.0f;
if (saturationAmount + satLevel <= 20) { // Checks to make sure we're being efficient with the food and not wasting high value foods
NBTTagCompound nbt = new NBTTagCompound(); // If the food provides more than the max saturation, we just accept it no matter what if the player is low
foodStats.writeNBT(nbt); // Pam please stop being weird. Fix your mod.
nbt.setFloat("foodSaturationLevel", saturationAmount + satLevel); if (saturationAmount + satLevel <= 20 || satLevel < 5) {
foodStats.readNBT(nbt); foodStats.addStats(foodItem, stack);
inventory.extractItem(i, 1, false);
inventory.decrStackSize(i, 1);
totalEffects++; totalEffects++;
lastSlot = i; lastSlot = i;
break; break;