Cleanup in ToolCommons, fix a stack null in bow

This commit is contained in:
Vincent Lee committed 2018-10-09 00:47:51 -05:00
1 parent c402bd01b6
commit 9eae466d30
6 files changed
+25 -43

No files matched your search

@@ -40,6 +40,7 @@ import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import java.util.Arrays;
import java.util.List;
import java.util.function.Predicate;
public final class ToolCommons {
@@ -49,62 +50,53 @@ public final class ToolCommons {
public static void damageItem(ItemStack stack, int dmg, EntityLivingBase entity, int manaPerDamage) {
int manaToRequest = dmg * manaPerDamage;
boolean manaRequested = entity instanceof EntityPlayer ? ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, manaToRequest, true) : false;
boolean manaRequested = entity instanceof EntityPlayer && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, manaToRequest, true);
if(!manaRequested)
stack.damageItem(dmg, entity);
}
public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos centerPos,
Vec3i startDelta, Vec3i endDelta, Block filterBlock, List<Material> materialsListing,
boolean silk, int fortune, boolean dispose) {
Vec3i startDelta, Vec3i endDelta, Predicate<IBlockState> filter,
boolean dispose) {
for (BlockPos iterPos : BlockPos.getAllInBox(centerPos.add(startDelta), centerPos.add(endDelta))) {
if (iterPos.equals(centerPos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it
continue;
removeBlockWithDrops(player, stack, world, iterPos, centerPos, filterBlock, materialsListing, silk, fortune, dispose);
removeBlockWithDrops(player, stack, world, iterPos, filter, dispose);
}
}
public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos,
Block filterBlock, List<Material> materialsListing,
boolean silk, int fortune, boolean dispose) {
removeBlockWithDrops(player, stack, world, pos, bPos, filterBlock, materialsListing, silk, fortune, dispose, true);
public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos,
Predicate<IBlockState> filter,
boolean dispose) {
removeBlockWithDrops(player, stack, world, pos, filter, dispose, true);
}
public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos,
Block filterBlock, List<Material> materialsListing,
boolean silk, int fortune, boolean dispose, boolean particles) {
public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos,
Predicate<IBlockState> filter,
boolean dispose, boolean particles) {
if(!world.isBlockLoaded(pos))
return;
IBlockState state = world.getBlockState(pos);
Block block = state.getBlock();
if(filterBlock != null && block != filterBlock)
return;
Material mat = world.getBlockState(pos).getMaterial();
if(!world.isRemote && !block.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) {
if(!block.canHarvestBlock(player.world, pos, player) || !materialsListing.contains(mat)) {
return;
}
if(!world.isRemote && filter.test(state)
&& !block.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0
&& block.canHarvestBlock(player.world, pos, player)) {
int exp = ForgeHooks.onBlockBreakEvent(world, ((EntityPlayerMP) player).interactionManager.getGameType(), (EntityPlayerMP) player, pos);
if(exp == -1)
return;
boolean spawnedDrops = false;
if(!player.capabilities.isCreativeMode) {
TileEntity tile = world.getTileEntity(pos);
IBlockState localState = world.getBlockState(pos);
if(block.removedByPlayer(state, world, pos, player, true)) {
block.onBlockDestroyedByPlayer(world, pos, state);
if(!dispose || !ItemElementiumPick.isDisposable(block)) {
block.harvestBlock(world, player, pos, state, tile, stack);
spawnedDrops = true;
block.dropXpOnBlockBreak(world, pos, exp);
}
}
@@ -113,9 +105,6 @@ public final class ToolCommons {
if(particles && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool)
world.playEvent(2001, pos, Block.getStateId(state));
if(spawnedDrops)
block.dropXpOnBlockBreak(world, pos, exp);
}
}
@@ -50,7 +50,7 @@ import java.util.function.Predicate;
public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModelRegister {
private static final Predicate<ItemStack> AMMO_FUNC = s -> s != null && s.getItem() instanceof ItemArrow;
private static final Predicate<ItemStack> AMMO_FUNC = s -> !s.isEmpty() && s.getItem() instanceof ItemArrow;
public static final int MANA_PER_DAMAGE = 40;
public ItemLivingwoodBow() {
@@ -40,12 +40,11 @@ public class ItemElementiumShovel extends ItemManasteelShovel {
if (block == null)
return false;
int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
Block blk = world.getBlockState(pos).getBlock();
if(blk instanceof BlockFalling)
ToolCommons.removeBlocksInIteration(player, stack, world, pos, new Vec3i(0, -12, 0), new Vec3i(1, 12, 1), blk, materialsShovel, silk, fortune, false);
ToolCommons.removeBlocksInIteration(player, stack, world, pos, new Vec3i(0, -12, 0), new Vec3i(1, 12, 1),
state -> state.getBlock() == blk,
false);
return false;
}
@@ -292,10 +292,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
// This is a ridiculous function call here.
ToolCommons.removeBlockWithDrops(player, truncator, world,
cand.coordinates,
origin,
null, ToolCommons.materialsAxe,
EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, truncator) > 0,
EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, truncator),
state -> ToolCommons.materialsAxe.contains(state.getMaterial()),
false, treatLeavesSpecial);
remainingSwaps--;
@@ -189,7 +189,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
Vec3i beginDiff = new Vec3i(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0);
Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0);
ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack));
ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, state -> MATERIALS.contains(state.getMaterial()), isTipped(stack));
if(origLevel == 5) {
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/rank_ss_pick"), "code_triggered");
@@ -28,7 +28,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -145,16 +144,14 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
List<BlockPos> cursors = getCursorList(lokiRing);
ISequentialBreaker breaker = (ISequentialBreaker) item;
World world = player.world;
boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
boolean dispose = breaker.disposeOfTrashBlocks(stack);
for (BlockPos offset : cursors) {
BlockPos coords = pos.add(offset);
IBlockState state = world.getBlockState(coords);
IBlockState state = player.world.getBlockState(coords);
breaker.breakOtherBlock(player, stack, coords, pos, side);
ToolCommons.removeBlockWithDrops(player, stack, player.world, coords, pos, state.getBlock(), Collections.singletonList(state.getMaterial()), silk, fortune, dispose);
ToolCommons.removeBlockWithDrops(player, stack, player.world, coords,
s -> s.getBlock() == state.getBlock() && s.getMaterial() == state.getMaterial(), dispose);
}
}