diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 80c4b375b..02f55ba4e 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -49,7 +49,7 @@ import techreborn.world.TechRebornWorldGen; import java.io.File; -@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.8.8,1.8.9]") +@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.9]") public class Core { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 91707f02e..1d23863b3 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -48,9 +48,9 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured return (Integer) state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length); + METADATA = PropertyInteger.create("type", 0, types.length); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index ab8fef2a4..cd0b3467a 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -71,9 +71,9 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { return state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 143f272d2..b0556ad83 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -186,9 +186,9 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi return state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 1e6a2766e..f29ac29ca 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -110,9 +110,9 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProv return state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index 5742f31bf..0701d0ac9 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -138,9 +138,9 @@ public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock return (Integer) state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 3418a5f61..8eed67ffd 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -2,7 +2,9 @@ package techreborn.blocks; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -28,14 +30,13 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota } @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!playerIn.isSneaking()) playerIn.openGui(Core.INSTANCE, GuiHandler.quantumChestID, worldIn, pos.getX(), pos.getY(), pos.getZ()); return true; } - private final String prefix = "techreborn:blocks/machine/"; @Override diff --git a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java index d388cc316..e213c509e 100644 --- a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java @@ -18,9 +18,9 @@ public class BlockReinforcedGlass extends BaseBlock implements ITexturedBlock { setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(4.0F); } - + @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return true; } diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index e1912cce7..364e2dd32 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -10,9 +10,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -49,16 +49,15 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO } @Override - @SideOnly(Side.CLIENT) - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return Blocks.leaves.getBlockLayer(); + return this.leavesFancy ? BlockRenderLayer.CUTOUT_MIPPED : BlockRenderLayer.SOLID; } @Override - public boolean isOpaqueCube() + public boolean isOpaqueCube(IBlockState state) { - return Blocks.leaves.isOpaqueCube(); + return Blocks.leaves.isOpaqueCube(state); } public boolean isFullCube() @@ -87,7 +86,7 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO } @Override - protected BlockStateContainer createBlockStateContainer() + protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, new IProperty[] { CHECK_DECAY, DECAYABLE}); } diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 25f6d2f87..0c9f7d14b 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -10,6 +10,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -28,21 +29,20 @@ import java.util.Random; */ public class BlockRubberLog extends Block implements ITexturedBlock { - public static PropertyDirection SAP_SIDE = PropertyDirection.create("sapSide", EnumFacing.Plane.HORIZONTAL); - public static PropertyBool HAS_SAP = PropertyBool.create("hasSap"); + public static PropertyDirection SAP_SIDE = PropertyDirection.create("sapside", EnumFacing.Plane.HORIZONTAL); + public static PropertyBool HAS_SAP = PropertyBool.create("hassap"); public BlockRubberLog() { super(Material.wood); setUnlocalizedName("techreborn.rubberlog"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); - this.setStepSound(soundTypeWood); RebornCore.jsonDestroyer.registerObject(this); this.setDefaultState(this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false)); this.setTickRandomly(true); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, SAP_SIDE, HAS_SAP); } @@ -100,7 +100,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock { } @Override - public boolean canSustainLeaves(net.minecraft.world.IBlockAccess world, BlockPos pos) { + public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } @@ -114,9 +114,9 @@ public class BlockRubberLog extends Block implements ITexturedBlock { int j = i + 1; if (worldIn.isAreaLoaded(pos.add(-j, -j, -j), pos.add(j, j, j))) { for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-i, -i, -i), pos.add(i, i, i))) { - IBlockState IBlockState = worldIn.getBlockState(blockpos); - if (IBlockState.getBlock().isLeaves(worldIn, blockpos)) { - IBlockState.getBlock().beginLeavesDecay(worldIn, blockpos); + IBlockState state1 = worldIn.getBlockState(blockpos); + if (state1.getBlock().isLeaves(state1, worldIn, blockpos)) { + state1.getBlock().beginLeavesDecay(state1,worldIn, blockpos); } } } @@ -136,19 +136,20 @@ public class BlockRubberLog extends Block implements ITexturedBlock { } @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) { - super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ); - if(playerIn.getCurrentEquippedItem() != null && playerIn.getCurrentEquippedItem().getItem() instanceof ItemTreeTap) + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + super.onBlockActivated(worldIn, pos, state, playerIn, hand, heldItem, side, hitX, hitY, hitZ); + if(playerIn.getHeldItem(EnumHand.MAIN_HAND) != null && playerIn.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof ItemTreeTap) if(state.getValue(HAS_SAP)){ if(state.getValue(SAP_SIDE) == side){ worldIn.setBlockState(pos, state.withProperty(HAS_SAP, false).withProperty(SAP_SIDE, EnumFacing.getHorizontal(0))); - worldIn.playSoundAtEntity(playerIn, "techreborn:sap_extract", 0.8F, 1F); + //TODO 1.9 sounds + //worldIn.playSoundAtEntity(playerIn, "techreborn:sap_extract", 0.8F, 1F); if(!worldIn.isRemote){ Random rand = new Random(); BlockPos itemPos = pos.offset(side); EntityItem item = new EntityItem(worldIn, itemPos.getX(), itemPos.getY(), itemPos.getZ(), ItemParts.getPartByName("rubberSap").copy()); float factor = 0.05F; - playerIn.getCurrentEquippedItem().damageItem(1, playerIn); + playerIn.getHeldItem(EnumHand.MAIN_HAND).damageItem(1, playerIn); item.motionX = rand.nextGaussian() * factor; item.motionY = rand.nextGaussian() * factor + 0.2F; item.motionZ = rand.nextGaussian() * factor; diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index fab957351..805156c9b 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -19,7 +19,6 @@ public class BlockRubberPlank extends Block implements ITexturedBlock { setUnlocalizedName("techreborn.rubberplank"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); - this.setStepSound(soundTypeWood); } @Override diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 27218313a..e2fc81654 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -86,9 +86,9 @@ public class BlockStorage extends BaseBlock implements ITexturedBlock { return state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index ec06ae824..5532902bd 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -84,9 +84,9 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock { return (Integer) state.getValue(METADATA); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { - METADATA = PropertyInteger.create("Type", 0, types.length -1); + METADATA = PropertyInteger.create("type", 0, types.length -1); return new BlockStateContainer(this, METADATA); } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index b8d22343f..fb8aa6902 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -26,7 +26,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false)); } - protected BlockStateContainer createBlockStateContainer() { + protected BlockStateContainer createBlockState() { ACTIVE = PropertyBool.create("active"); return new BlockStateContainer(this, ACTIVE); } diff --git a/src/main/java/techreborn/items/ItemEnergyCrystal.java b/src/main/java/techreborn/items/ItemEnergyCrystal.java index 591407138..6614a65ff 100644 --- a/src/main/java/techreborn/items/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/ItemEnergyCrystal.java @@ -40,7 +40,7 @@ public class ItemEnergyCrystal extends ItemTextureBase implements IEnergyItemInf } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/ItemLapotronCrystal.java b/src/main/java/techreborn/items/ItemLapotronCrystal.java index d872216c7..67452c514 100644 --- a/src/main/java/techreborn/items/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/ItemLapotronCrystal.java @@ -40,7 +40,7 @@ public class ItemLapotronCrystal extends ItemTextureBase implements IEnergyItemI } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/ItemLapotronicOrb.java b/src/main/java/techreborn/items/ItemLapotronicOrb.java index edbec012b..b258af349 100644 --- a/src/main/java/techreborn/items/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/ItemLapotronicOrb.java @@ -44,7 +44,7 @@ public class ItemLapotronicOrb extends ItemTextureBase implements IEnergyItemInf } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/ItemLithiumBattery.java b/src/main/java/techreborn/items/ItemLithiumBattery.java index 1c09c7b81..8c1d96fb5 100644 --- a/src/main/java/techreborn/items/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/ItemLithiumBattery.java @@ -66,7 +66,7 @@ public class ItemLithiumBattery extends ItemTextureBase implements IEnergyItemIn } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return 1; } diff --git a/src/main/java/techreborn/items/ItemReBattery.java b/src/main/java/techreborn/items/ItemReBattery.java index 8a4ef54bf..2e6c30f05 100644 --- a/src/main/java/techreborn/items/ItemReBattery.java +++ b/src/main/java/techreborn/items/ItemReBattery.java @@ -66,7 +66,7 @@ public class ItemReBattery extends ItemTextureBase implements IEnergyItemInfo { } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return 1; } diff --git a/src/main/java/techreborn/items/ItemTextureBase.java b/src/main/java/techreborn/items/ItemTextureBase.java index 293487fd1..57cbd5545 100644 --- a/src/main/java/techreborn/items/ItemTextureBase.java +++ b/src/main/java/techreborn/items/ItemTextureBase.java @@ -1,16 +1,11 @@ package techreborn.items; - import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import techreborn.lib.ModInfo; public abstract class ItemTextureBase extends ItemTR implements ITexturedItem { - @Override - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } +// @Override +// public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { +// return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); +// } } diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index d5a1bae99..453437582 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -4,6 +4,7 @@ package techreborn.items.armor; import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -24,17 +25,16 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex public double transferLimit = 100000; public ItemLapotronPack() { - super(ItemArmor.ArmorMaterial.DIAMOND, 7, 1); + super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST); setCreativeTab(TechRebornCreativeTab.instance); setUnlocalizedName("techreborn.lapotronpack"); setMaxStackSize(1); RebornCore.jsonDestroyer.registerObject(this); } - @Override @SideOnly(Side.CLIENT) - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return "techreborn:" + "textures/models/lapotronpack.png"; } @@ -59,7 +59,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 4796baeb2..5a6cf5947 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -3,6 +3,7 @@ package techreborn.items.armor; import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -23,7 +24,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT public double transferLimit = 10000; public ItemLithiumBatpack() { - super(ItemArmor.ArmorMaterial.DIAMOND, 7, 1); + super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST); setMaxStackSize(1); setUnlocalizedName("techreborn.lithiumbatpack"); setCreativeTab(TechRebornCreativeTab.instance); @@ -34,7 +35,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT @Override @SideOnly(Side.CLIENT) - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return "techreborn:" + "textures/models/lithiumbatpack.png"; } @@ -59,7 +60,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 142f40a9c..f4bd6ac36 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -50,31 +50,31 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI this.unpoweredSpeed = unpoweredSpeed; } - @Override - public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { - Random rand = new Random(); - if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack) + 1) == 0) { - PoweredItem.useEnergy(cost, stack); - } - return true; - } +// @Override +// public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { +// Random rand = new Random(); +// if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack) + 1) == 0) { +// PoweredItem.useEnergy(cost, stack); +// } +// return true; +// } - @Override - public float getDigSpeed(ItemStack stack, IBlockState state) { - if (!PoweredItem.canUseEnergy(cost, stack)) { - return unpoweredSpeed; - } - - if (OreDictUtils.isOre(state, "treeLeaves") && PoweredItem.canUseEnergy(cost, stack)) { - return 40F; - } - - if (Items.wooden_axe.getDigSpeed(stack, state) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, state); - } - } +// @Override +// public float getDigSpeed(ItemStack stack, IBlockState state) { +// if (!PoweredItem.canUseEnergy(cost, stack)) { +// return unpoweredSpeed; +// } +// +// if (OreDictUtils.isOre(state, "treeLeaves") && PoweredItem.canUseEnergy(cost, stack)) { +// return 40F; +// } +// +// if (Items.wooden_axe.getDigSpeed(stack, state) > 1.0F) { +// return efficiencyOnProperMaterial; +// } else { +// return super.getDigSpeed(stack, state); +// } +// } @Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { @@ -112,7 +112,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index f15b88488..80ddb5927 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -3,6 +3,8 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -36,18 +38,12 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn PoweredItem.useEnergy(ConfigTechReborn.CloakingDeviceEUTick, itemStack); player.setInvisible(true); } else { - if (!player.isPotionActive(Potion.invisibility)) { + if (!player.isPotionActive(MobEffects.invisibility)) { player.setInvisible(false); } } } - @Override - public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { - return armorType == this.armorType; - - } - @Override public double getMaxPower(ItemStack stack) { return MaxCharge; @@ -69,15 +65,15 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return Teir; } public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { - ItemStack itemstack1 = player.getCurrentArmor(3); + ItemStack itemstack1 = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (itemstack1 == null) { - player.setCurrentItemOrArmor(3, itemStack.copy()); + player.setItemStackToSlot(EntityEquipmentSlot.CHEST, itemStack.copy()); itemStack.stackSize = 0; } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 1205278ee..aaa872ef9 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -1,6 +1,7 @@ package techreborn.items.tools; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import techreborn.config.ConfigTechReborn; @@ -8,13 +9,13 @@ import techreborn.config.ConfigTechReborn; public class ItemDiamondDrill extends ItemDrill { public ItemDiamondDrill() { - super(ToolMaterial.EMERALD, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge, ConfigTechReborn.DiamondDrillTier, 2.5F); + super(ToolMaterial.DIAMOND, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge, ConfigTechReborn.DiamondDrillTier, 2.5F); this.cost = 250; } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); + public boolean canHarvestBlock(IBlockState state) { + return Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 9348f373d..c3eaa659f 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -5,7 +5,7 @@ import techreborn.config.ConfigTechReborn; public class ItemDiamondJackhammer extends ItemJackhammer { public ItemDiamondJackhammer() { - super(ToolMaterial.EMERALD, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge, ConfigTechReborn.DiamondJackhammerTier); + super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge, ConfigTechReborn.DiamondJackhammerTier); this.cost = 250; this.efficiencyOnProperMaterial = 60F; } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 2993fb79f..13d676b3e 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -12,6 +12,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -47,26 +49,26 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured this.unpoweredSpeed = unpoweredSpeed; } - @Override - public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { - Random rand = new Random(); - if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack)+1) == 0) { - PoweredItem.useEnergy(cost, stack); - } - return true; - } - - @Override - public float getDigSpeed(ItemStack stack, IBlockState state) { - if (!PoweredItem.canUseEnergy(cost, stack)) { - return unpoweredSpeed; - } - if (Items.wooden_pickaxe.getDigSpeed(stack, state) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, state) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, state); - } - } +// @Override +// public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { +// Random rand = new Random(); +// if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack)+1) == 0) { +// PoweredItem.useEnergy(cost, stack); +// } +// return true; +// } +// +// @Override +// public float getDigSpeed(ItemStack stack, IBlockState state) { +// if (!PoweredItem.canUseEnergy(cost, stack)) { +// return unpoweredSpeed; +// } +// if (Items.wooden_pickaxe.getDigSpeed(stack, state) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, state) > 1.0F) { +// return efficiencyOnProperMaterial; +// } else { +// return super.getDigSpeed(stack, state); +// } +// } @Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { @@ -74,8 +76,8 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, side, hitX, hitY, hitZ); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override @@ -104,7 +106,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/tools/ItemHammer.java b/src/main/java/techreborn/items/tools/ItemHammer.java index cf9371693..7f5bcccb8 100644 --- a/src/main/java/techreborn/items/tools/ItemHammer.java +++ b/src/main/java/techreborn/items/tools/ItemHammer.java @@ -17,11 +17,11 @@ public class ItemHammer extends ItemTR implements ITexturedItem { setMaxDamage(MaxDamage); } - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - world.playSoundAtEntity(player, "techreborn:block_dismantle", 0.8F, 0.4F); - return true; - } +// @Override +// public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { +// world.playSoundAtEntity(player, "techreborn:block_dismantle", 0.8F, 0.4F); +// return true; +// } @Override public Item setUnlocalizedName(String par1Str) { diff --git a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java b/src/main/java/techreborn/items/tools/ItemIronChainsaw.java index 011d53b78..21dcd124e 100644 --- a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemIronChainsaw.java @@ -1,6 +1,7 @@ package techreborn.items.tools; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import techreborn.config.ConfigTechReborn; @@ -13,8 +14,8 @@ public class ItemIronChainsaw extends ItemChainsaw { } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.iron_axe.canHarvestBlock(block, stack); + public boolean canHarvestBlock(IBlockState state) { + return Items.iron_axe.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemIronDrill.java b/src/main/java/techreborn/items/tools/ItemIronDrill.java index 9c1e0735a..f7151c00f 100644 --- a/src/main/java/techreborn/items/tools/ItemIronDrill.java +++ b/src/main/java/techreborn/items/tools/ItemIronDrill.java @@ -1,6 +1,7 @@ package techreborn.items.tools; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import techreborn.config.ConfigTechReborn; @@ -13,8 +14,8 @@ public class ItemIronDrill extends ItemDrill { } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.iron_pickaxe.canHarvestBlock(block, stack) || Items.iron_shovel.canHarvestBlock(block, stack); + public boolean canHarvestBlock(IBlockState state) { + return Items.iron_pickaxe.canHarvestBlock(state) || Items.iron_shovel.canHarvestBlock(state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 9539848bf..950b2e879 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -11,6 +11,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -45,31 +47,32 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex this.tier = tier; } - @Override - public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { - Random rand = new Random(); - if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack) + 1) == 0) { - PoweredItem.useEnergy(cost, stack); - } - return true; - } +// @Override +// public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { +// Random rand = new Random(); +// if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack) + 1) == 0) { +// PoweredItem.useEnergy(cost, stack); +// } +// return true; +// } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - if (OreDictUtils.isOre(block, "stone") && PoweredItem.canUseEnergy(cost, stack)) { + public boolean canHarvestBlock(IBlockState state) { + //TODO needs // FIXME: 13/03/2016 + if (OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, null)) { return true; } return false; } - @Override - public float getDigSpeed(ItemStack stack, IBlockState state) { - if (OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, stack)) { - return efficiencyOnProperMaterial; - } else { - return 0.5F; - } - } +// @Override +// public float getDigSpeed(ItemStack stack, IBlockState state) { +// if (OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, stack)) { +// return efficiencyOnProperMaterial; +// } else { +// return 0.5F; +// } +// } @Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { @@ -77,8 +80,8 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, side, hitX, hitY, hitZ); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override @@ -107,7 +110,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index c282c33d6..ecd5e0972 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -118,7 +118,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return tier; } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 616a60f84..83b828878 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -10,6 +10,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; @@ -33,7 +35,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu public int hitCost = 125; public ItemOmniTool() { - super(ToolMaterial.EMERALD); + super(ToolMaterial.DIAMOND); efficiencyOnProperMaterial = 13F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); @@ -43,37 +45,37 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu } @Override - public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn) { + public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { PoweredItem.useEnergy(cost, stack); return true; } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) - || Items.diamond_sword.canHarvestBlock(block, stack) - || Items.diamond_pickaxe.canHarvestBlock(block, stack) - || Items.diamond_shovel.canHarvestBlock(block, stack) - || Items.shears.canHarvestBlock(block, stack); + public boolean canHarvestBlock(IBlockState state) { + return Items.diamond_axe.canHarvestBlock(state) + || Items.diamond_sword.canHarvestBlock(state) + || Items.diamond_pickaxe.canHarvestBlock(state) + || Items.diamond_shovel.canHarvestBlock(state) + || Items.shears.canHarvestBlock(state); } - @Override - public float getDigSpeed(ItemStack stack, IBlockState state) { - if (PoweredItem.canUseEnergy(cost, stack)) { - PoweredItem.useEnergy(cost, stack); - return 5.0F; - } - - if (Items.wooden_axe.getDigSpeed(stack, state) > 1.0F - || Items.wooden_sword.getDigSpeed(stack, state) > 1.0F - || Items.wooden_pickaxe.getDigSpeed(stack, state) > 1.0F - || Items.wooden_shovel.getDigSpeed(stack, state) > 1.0F - || Items.shears.getDigSpeed(stack, state) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, state); - } - } +// @Override +// public float getDigSpeed(ItemStack stack, IBlockState state) { +// if (PoweredItem.canUseEnergy(cost, stack)) { +// PoweredItem.useEnergy(cost, stack); +// return 5.0F; +// } +// +// if (Items.wooden_axe.getDigSpeed(stack, state) > 1.0F +// || Items.wooden_sword.getDigSpeed(stack, state) > 1.0F +// || Items.wooden_pickaxe.getDigSpeed(stack, state) > 1.0F +// || Items.wooden_shovel.getDigSpeed(stack, state) > 1.0F +// || Items.shears.getDigSpeed(stack, state) > 1.0F) { +// return efficiencyOnProperMaterial; +// } else { +// return super.getDigSpeed(stack, state); +// } +// } @Override public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { @@ -85,8 +87,8 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, side, hitX, hitY, hitZ); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override @@ -116,7 +118,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return 2; } diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 742d6f4b5..8988cecd3 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -2,6 +2,7 @@ package techreborn.items.tools; import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; @@ -50,40 +51,40 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex } @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - if (Items.diamond_pickaxe.canHarvestBlock(block, stack)) { - if (PoweredItem.canUseEnergy(cost, stack)) { - PoweredItem.useEnergy(cost, stack); - return true; - } + public boolean canHarvestBlock(IBlockState state) { + if (Items.diamond_pickaxe.canHarvestBlock(state)) { +// if (PoweredItem.canUseEnergy(cost, stack)) { +// PoweredItem.useEnergy(cost, stack); +// return true; +// } } return false; } - @Override - public int getHarvestLevel(ItemStack stack, String toolClass) { - if (!stack.isItemEnchanted()) { - stack.addEnchantment(Enchantment.silkTouch, 1); - } - return super.getHarvestLevel(stack, toolClass); - } - - @Override - public float getStrVsBlock(ItemStack stack, Block block) { - if (!stack.isItemEnchanted()) { - stack.addEnchantment(Enchantment.silkTouch, 1); - } - return super.getStrVsBlock(stack, block); - } +// @Override +// public int getHarvestLevel(ItemStack stack, String toolClass) { +// if (!stack.isItemEnchanted()) { +// stack.addEnchantment(Enchantment.silkTouch, 1); +// } +// return super.getHarvestLevel(stack, toolClass); +// } +// +// @Override +// public float getStrVsBlock(ItemStack stack, Block block) { +// if (!stack.isItemEnchanted()) { +// stack.addEnchantment(Enchantment.silkTouch, 1); +// } +// return super.getStrVsBlock(stack, block); +// } @Override public boolean isRepairable() { return false; } - public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par1ItemStack.addEnchantment(Enchantment.silkTouch, 1); - } +// public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { +// par1ItemStack.addEnchantment(Enchantment.silkTouch, 1); +// } @Override @@ -107,7 +108,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex } @Override - public int getStackTeir(ItemStack stack) { + public int getStackTier(ItemStack stack) { return 2; } diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 71386438d..296d3d54d 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -12,6 +12,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -34,17 +36,18 @@ public class ItemWrench extends ItemTR implements ITexturedItem { setMaxStackSize(1); } + @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if(world.isAirBlock(pos) || !player.isSneaking()){ - return false; + return EnumActionResult.FAIL; } TileEntity tile = world.getTileEntity(pos); if(tile == null){ - return false; + return EnumActionResult.FAIL; } if(!(tile instanceof IInventory)){ - return false; + return EnumActionResult.FAIL; } List items = new ArrayList(); @@ -69,7 +72,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { if(((IWrenchable) tile).wrenchCanRemove(player)){ ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); if(itemStack == null){ - return false; + return EnumActionResult.FAIL; } items.add(itemStack); } @@ -99,9 +102,9 @@ public class ItemWrench extends ItemTR implements ITexturedItem { if(!world.isRemote){ world.setBlockState(pos, Blocks.air.getDefaultState(), 2); } - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.FAIL; } @Override