Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does
This commit is contained in:
parent
a32c40a68a
commit
1ebf67d933
2 changed files with 20 additions and 9 deletions
|
@ -26,6 +26,7 @@ package techreborn.init.recipes;
|
|||
|
||||
import com.google.common.base.CaseFormat;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Enchantments;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
@ -65,7 +66,9 @@ public class CraftingTableRecipes extends RecipeMethods {
|
|||
registerShaped(getStack(ModItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood");
|
||||
registerShaped(getStack(ModItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(ModItems.TREE_TAP), 'B', "reBattery");
|
||||
registerShaped(getStack(ModItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', getMaterialObject("glowstone", Type.SMALL_DUST));
|
||||
registerShaped(getStack(ModItems.ROCK_CUTTER), "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery");
|
||||
ItemStack rockCutter = getStack(ModItems.ROCK_CUTTER);
|
||||
rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(ModItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(getStack(ModItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(ModItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
|
||||
registerShaped(getStack(ModItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(ModItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
|
||||
|
|
|
@ -26,7 +26,6 @@ package techreborn.items.tools;
|
|||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -47,9 +46,9 @@ import reborncore.common.powerSystem.PowerSystem;
|
|||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.utils.TechRebornCreativeTab;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.utils.TechRebornCreativeTab;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Random;
|
||||
|
@ -66,7 +65,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
setMaxStackSize(1);
|
||||
efficiency = 16F;
|
||||
}
|
||||
|
||||
|
||||
// ItemPickaxe
|
||||
@Override
|
||||
public boolean canHarvestBlock(IBlockState state) {
|
||||
|
@ -75,7 +74,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public float getDestroySpeed(ItemStack stack, IBlockState state) {
|
||||
if (stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored() < cost) {
|
||||
|
@ -96,9 +95,14 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
}
|
||||
|
||||
@Override
|
||||
public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState) {
|
||||
public int getHarvestLevel(ItemStack stack,
|
||||
String toolClass,
|
||||
@Nullable
|
||||
EntityPlayer player,
|
||||
@Nullable
|
||||
IBlockState blockState) {
|
||||
if (!stack.isItemEnchanted()) {
|
||||
stack.addEnchantment(Enchantment.getEnchantmentByID(33), 1);
|
||||
stack.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
}
|
||||
return super.getHarvestLevel(stack, toolClass, player, blockState);
|
||||
}
|
||||
|
@ -131,10 +135,12 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
|
||||
@Override
|
||||
@Nullable
|
||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||
public ICapabilityProvider initCapabilities(ItemStack stack,
|
||||
@Nullable
|
||||
NBTTagCompound nbt) {
|
||||
return new PoweredItemContainerProvider(stack);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) {
|
||||
return !(newStack.isItemEqual(oldStack));
|
||||
|
@ -147,7 +153,9 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
return;
|
||||
}
|
||||
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
charged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
|
|
Loading…
Reference in a new issue