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

Rewrite the placer ritual

Browse source 
Includes a slight nerf: Instead of placing the entire 25x25 at the same time, it now places 1 block at a time.

This was brought on by 30 minutes of debugging an intended feature that was mistaken for a bug in #1103

TODO: Rewrite most of the rituals to get rid of any remaining legacy code
This commit is contained in:
Nicholas Ignoffo 2017-03-14 20:17:57 -07:00
parent 216bdb2d2e
commit a5a47c42aa
1 changed files with 16 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java
View file

@ -3,8 +3,9 @@ package WayofTime.bloodmagic.ritual;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.ritual.*; import WayofTime.bloodmagic.api.ritual.*;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.inventory.IInventory; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
@ -46,11 +47,9 @@ public class RitualPlacer extends Ritual
} }
AreaDescriptor areaDescriptor = getBlockRange(PLACER_RANGE); AreaDescriptor areaDescriptor = getBlockRange(PLACER_RANGE);
IInventory inventory;
if (tileEntity != null) if (tileEntity != null)
{ {
// Using the new Forge inventory system
if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN))
{ {
IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN);
@ -60,50 +59,24 @@ public class RitualPlacer extends Ritual
return; return;
} }
posLoop:
for (BlockPos blockPos : areaDescriptor.getContainedPositions(masterRitualStone.getBlockPos())) for (BlockPos blockPos : areaDescriptor.getContainedPositions(masterRitualStone.getBlockPos()))
{ {
for (int inv = 0; inv < itemHandler.getSlots(); inv++) if (!world.getBlockState(blockPos).getBlock().isReplaceable(world, blockPos))
continue;
for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++)
{ {
if (world.getBlockState(blockPos).getBlock().isReplaceable(world, blockPos) && !itemHandler.getStackInSlot(inv).isEmpty()) ItemStack stack = itemHandler.extractItem(invSlot, 1, true);
{ if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock))
if (itemHandler.getStackInSlot(inv).getItem() instanceof ItemBlock && world.isAirBlock(blockPos.down())) continue;
{
if (!itemHandler.extractItem(inv, 1, true).isEmpty()) IBlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(invSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(invSlot).getItemDamage());
{ world.setBlockState(blockPos, placeState);
world.setBlockState(blockPos, Block.getBlockFromItem(itemHandler.getStackInSlot(inv).getItem()).getStateFromMeta(itemHandler.getStackInSlot(inv).getItemDamage())); itemHandler.extractItem(invSlot, 1, false);
itemHandler.extractItem(inv, 1, false);
tileEntity.markDirty(); tileEntity.markDirty();
masterRitualStone.getOwnerNetwork().syphon(getRefreshCost()); masterRitualStone.getOwnerNetwork().syphon(getRefreshCost());
} break posLoop; // Break instead of return in case we add things later
}
}
}
}
//Compatibility with the old system, as it still exists
} else if (tileEntity instanceof IInventory)
{
inventory = (IInventory) tileEntity;
if (inventory.getSizeInventory() <= 0)
{
return;
}
for (BlockPos blockPos : areaDescriptor.getContainedPositions(masterRitualStone.getBlockPos()))
{
for (int inv = 0; inv < inventory.getSizeInventory(); inv++)
{
if (world.getBlockState(blockPos).getBlock().isReplaceable(world, blockPos) && !inventory.getStackInSlot(inv).isEmpty())
{
if (inventory.getStackInSlot(inv).getItem() instanceof ItemBlock && world.isAirBlock(blockPos.down()))
{
world.setBlockState(blockPos, Block.getBlockFromItem(inventory.getStackInSlot(inv).getItem()).getStateFromMeta(inventory.getStackInSlot(inv).getItemDamage()));
inventory.decrStackSize(inv, 1);
inventory.markDirty();
masterRitualStone.getOwnerNetwork().syphon(getRefreshCost());
break;
}
}
} }
} }
} }