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

Fixed Hellfire Forge Aura Consumption

Browse source 
Fixed the Hellfire Forge so that it actually consumes Will from the Aura.
This commit is contained in:
WayofTime 2020-11-24 21:19:25 -05:00
parent ab9de5341e
commit 69ad344aa0
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java
View file

@ -17,18 +17,18 @@ import net.minecraft.util.text.StringTextComponent;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.ObjectHolder; import net.minecraftforge.registries.ObjectHolder;
import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType; import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.api.compat.IDemonWill; import wayoftime.bloodmagic.api.compat.IDemonWill;
import wayoftime.bloodmagic.api.compat.IDemonWillConduit; import wayoftime.bloodmagic.api.compat.IDemonWillConduit;
import wayoftime.bloodmagic.api.compat.IDemonWillGem; import wayoftime.bloodmagic.api.compat.IDemonWillGem;
import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.recipe.RecipeTartaricForge;
import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
import wayoftime.bloodmagic.util.Constants;
public class TileSoulForge extends TileInventory public class TileSoulForge extends TileInventory implements ITickableTileEntity, INamedContainerProvider, IDemonWillConduit
implements ITickableTileEntity, INamedContainerProvider, IDemonWillConduit
{ {
@ObjectHolder("bloodmagic:soulforge") @ObjectHolder("bloodmagic:soulforge")
public static TileEntityType<TileSoulForge> TYPE; public static TileEntityType<TileSoulForge> TYPE;
@ -110,6 +110,27 @@ public class TileSoulForge extends TileInventory
return; return;
} }
if (!getWorld().isRemote)
{
for (EnumDemonWillType type : EnumDemonWillType.values())
{
double willInWorld = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type);
double filled = Math.min(willInWorld, worldWillTransferRate);
if (filled > 0)
{
filled = this.fillDemonWill(type, filled, false);
filled = WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, false);
if (filled > 0)
{
this.fillDemonWill(type, filled, true);
WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, true);
}
}
}
}
double soulsInGem = getWill(EnumDemonWillType.DEFAULT); double soulsInGem = getWill(EnumDemonWillType.DEFAULT);
List<ItemStack> inputList = new ArrayList<>(); List<ItemStack> inputList = new ArrayList<>();
@ -237,8 +258,7 @@ public class TileSoulForge extends TileInventory
if (soulStack != null) if (soulStack != null)
{ {
if (soulStack.getItem() instanceof IDemonWill if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type)
&& ((IDemonWill) soulStack.getItem()).getType(soulStack) == type)
{ {
IDemonWill soul = (IDemonWill) soulStack.getItem(); IDemonWill soul = (IDemonWill) soulStack.getItem();
return soul.getWill(type, soulStack); return soul.getWill(type, soulStack);
@ -260,8 +280,7 @@ public class TileSoulForge extends TileInventory
if (soulStack != null) if (soulStack != null)
{ {
if (soulStack.getItem() instanceof IDemonWill if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type)
&& ((IDemonWill) soulStack.getItem()).getType(soulStack) == type)
{ {
IDemonWill soul = (IDemonWill) soulStack.getItem(); IDemonWill soul = (IDemonWill) soulStack.getItem();
double souls = soul.drainWill(type, soulStack, requested); double souls = soul.drainWill(type, soulStack, requested);