From 2f102b6be6ac9e736eb44f797f33e23227c92eeb Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 6 Nov 2014 17:07:17 -0500 Subject: [PATCH] Fix hardcoded blocks for spoon upgrade, allow pick to mine glass. Update release notes. --- ReleaseNotes.txt | 6 +++++ .../item/darksteel/ItemDarkSteelPickaxe.java | 23 +++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index d04c07ff..f3803453 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -5,6 +5,12 @@ Version 2.1.9 Changes - Updated Build Craft API to v6.1.5. NB: EIO will no longer work with pre 6.1 BC versions - Added tool blacklist to prevent broken spawners dropping when using those tools +- Add ME Conduits - basic, carry 8 channels. Unfinished. (tterrag) +- Allow dark pick to work on glass material blocks such as glowstone (tterrag) + +Bugs +- Fix NEI handler for vat showing fire if a recipe only has one item. (tterrag) +- Fix spoon upgrade only working on certain blocks (tterrag) ------------------------------------------------------ Version 2.1.8 diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index a0e13f99..88b3db66 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -3,15 +3,13 @@ package crazypants.enderio.item.darksteel; import java.util.List; import java.util.Set; -import com.google.common.collect.Sets; - import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -21,6 +19,9 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; + +import com.google.common.collect.Sets; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,9 +40,7 @@ import crazypants.util.Lang; public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { - private static final Set SHOVEL_BLOCKS = Sets.newHashSet(new Block[] { - Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, - Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium }); + private static final Set SHOVEL_MATS = Sets.newHashSet(new Material[] { Material.clay, Material.craftedSnow, Material.grass, Material.ground, Material.sand, Material.snow }); public static boolean isEquipped(EntityPlayer player) { if(player == null) { @@ -184,14 +183,21 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public float func_150893_a(ItemStack item, Block block) { int energy = getEnergyStored(item); + if(block == Blocks.obsidian && energy > 0) { return super.func_150893_a(item, block) + Config.darkSteelPickEffeciencyObsidian; } + + if (block.getMaterial() == Material.glass) { + return efficiencyOnProperMaterial; + } + if(energy > 0 && hasSpoonUpgrade(item)) { - if(SHOVEL_BLOCKS.contains(block)) { + if(SHOVEL_MATS.contains(block.getMaterial())) { return efficiencyOnProperMaterial; } } + return super.func_150893_a(item, block); } @@ -202,13 +208,12 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } else { return super.canHarvestBlock(block, item); } - } private boolean hasSpoonUpgrade(ItemStack item) { return SpoonUpgrade.loadFromItem(item) != null; } - + @Override public float getDigSpeed(ItemStack stack, Block block, int meta) { if(ForgeHooks.isToolEffective(stack, block, meta)) {