Auto update mappings
This commit is contained in:
parent
595c9575b1
commit
4095a0b52d
79 changed files with 704 additions and 644 deletions
|
@ -41,15 +41,15 @@ public class ItemDusts extends ItemTextureBase
|
|||
|
||||
if (name.equalsIgnoreCase("glowstone"))
|
||||
{
|
||||
return new ItemStack(Items.glowstone_dust, count);
|
||||
return new ItemStack(Items.GLOWSTONE_DUST, count);
|
||||
}
|
||||
if (name.equalsIgnoreCase("redstone"))
|
||||
{
|
||||
return new ItemStack(Items.redstone, count);
|
||||
return new ItemStack(Items.REDSTONE, count);
|
||||
}
|
||||
if (name.equalsIgnoreCase("gunpowder"))
|
||||
{
|
||||
return new ItemStack(Items.gunpowder, count);
|
||||
return new ItemStack(Items.GUNPOWDER, count);
|
||||
}
|
||||
throw new InvalidParameterException("The dust " + name + " could not be found.");
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
/**
|
||||
* Created by modmuss50 on 26/02/2016.
|
||||
*/
|
||||
|
|
|
@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.text.TextFormatting;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemAdvancedChainsaw extends ItemChainsaw
|
||||
{
|
||||
|
||||
|
@ -22,7 +23,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState blockIn)
|
||||
{
|
||||
return Items.diamond_axe.canHarvestBlock(blockIn);
|
||||
return Items.DIAMOND_AXE.canHarvestBlock(blockIn);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.text.TextFormatting;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemAdvancedDrill extends ItemDrill
|
||||
{
|
||||
|
||||
|
@ -22,7 +23,7 @@ public class ItemAdvancedDrill extends ItemDrill
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState blockIn)
|
||||
{
|
||||
return Items.diamond_pickaxe.canHarvestBlock(blockIn) || Items.diamond_shovel.canHarvestBlock(blockIn);
|
||||
return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -25,6 +25,7 @@ import reborncore.common.util.TorchHelper;
|
|||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
|
||||
{
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
|
|||
player.setInvisible(true);
|
||||
} else
|
||||
{
|
||||
if (!player.isPotionActive(MobEffects.invisibility))
|
||||
if (!player.isPotionActive(MobEffects.INVISIBILITY))
|
||||
{
|
||||
player.setInvisible(false);
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
|
|||
import net.minecraft.init.Items;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemDiamondChainsaw extends ItemChainsaw
|
||||
{
|
||||
|
||||
|
@ -17,7 +18,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState blockIn)
|
||||
{
|
||||
return Items.diamond_axe.canHarvestBlock(blockIn);
|
||||
return Items.DIAMOND_AXE.canHarvestBlock(blockIn);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
|
|||
import net.minecraft.init.Items;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemDiamondDrill extends ItemDrill
|
||||
{
|
||||
|
||||
|
@ -17,7 +18,7 @@ public class ItemDiamondDrill extends ItemDrill
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState state)
|
||||
{
|
||||
return Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state);
|
||||
return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -2,6 +2,7 @@ package techreborn.items.tools;
|
|||
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemDiamondJackhammer extends ItemJackhammer
|
||||
{
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@ import techreborn.lib.ModInfo;
|
|||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
|
||||
{
|
||||
|
||||
|
@ -70,8 +71,8 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
|
|||
{
|
||||
return unpoweredSpeed;
|
||||
}
|
||||
if (Items.wooden_pickaxe.getStrVsBlock(stack, state) > 1.0F
|
||||
|| Items.wooden_shovel.getStrVsBlock(stack, state) > 1.0F)
|
||||
if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F
|
||||
|| Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F)
|
||||
{
|
||||
return efficiencyOnProperMaterial;
|
||||
} else
|
||||
|
|
|
@ -20,7 +20,7 @@ public class ItemFluidbucket extends ItemBucket implements ITexturedItem
|
|||
public ItemFluidbucket(BlockFluidBase block)
|
||||
{
|
||||
super(block);
|
||||
setContainerItem(Items.bucket);
|
||||
setContainerItem(Items.BUCKET);
|
||||
setCreativeTab(TechRebornCreativeTabMisc.instance);
|
||||
setUnlocalizedName("techreborn.fluidbucket");
|
||||
RebornCore.jsonDestroyer.registerObject(this);
|
||||
|
|
|
@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
|
|||
import net.minecraft.init.Items;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemIronChainsaw extends ItemChainsaw
|
||||
{
|
||||
|
||||
|
@ -17,7 +18,7 @@ public class ItemIronChainsaw extends ItemChainsaw
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState state)
|
||||
{
|
||||
return Items.iron_axe.canHarvestBlock(state);
|
||||
return Items.IRON_AXE.canHarvestBlock(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
|
|||
import net.minecraft.init.Items;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemIronDrill extends ItemDrill
|
||||
{
|
||||
|
||||
|
@ -17,7 +18,7 @@ public class ItemIronDrill extends ItemDrill
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState state)
|
||||
{
|
||||
return Items.iron_pickaxe.canHarvestBlock(state) || Items.iron_shovel.canHarvestBlock(state);
|
||||
return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -2,6 +2,7 @@ package techreborn.items.tools;
|
|||
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemIronJackhammer extends ItemJackhammer
|
||||
{
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@ import techreborn.utils.OreDictUtils;
|
|||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
|
||||
{
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ import reborncore.common.util.ItemNBTHelper;
|
|||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITexturedItem
|
||||
{
|
||||
|
||||
|
|
|
@ -29,6 +29,7 @@ import techreborn.client.TechRebornCreativeTab;
|
|||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem
|
||||
{
|
||||
|
||||
|
@ -59,9 +60,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
|
|||
@Override
|
||||
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);
|
||||
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
|
||||
|
|
|
@ -22,6 +22,7 @@ import techreborn.client.TechRebornCreativeTab;
|
|||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem
|
||||
{
|
||||
|
||||
|
@ -58,7 +59,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
|
|||
@Override
|
||||
public boolean canHarvestBlock(IBlockState state)
|
||||
{
|
||||
if (Items.diamond_pickaxe.canHarvestBlock(state))
|
||||
if (Items.DIAMOND_PICKAXE.canHarvestBlock(state))
|
||||
{
|
||||
// if (PoweredItem.canUseEnergy(cost, stack)) {
|
||||
// PoweredItem.useEnergy(cost, stack);
|
||||
|
|
|
@ -2,6 +2,7 @@ package techreborn.items.tools;
|
|||
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemSteelJackhammer extends ItemJackhammer
|
||||
{
|
||||
|
||||
|
|
|
@ -20,12 +20,13 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld {
|
||||
private ToolMaterial material = ToolMaterial.WOOD;
|
||||
|
||||
private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf,
|
||||
Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block,
|
||||
Blocks.ladder, Blocks.wooden_button, Blocks.wooden_pressure_plate });
|
||||
private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.PLANKS, Blocks.BOOKSHELF,
|
||||
Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK,
|
||||
Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE });
|
||||
|
||||
public ItemTRAxe(ToolMaterial material) {
|
||||
super(material, EFFECTIVE_ON);
|
||||
|
@ -39,7 +40,7 @@ public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld {
|
|||
|
||||
public float getStrVsBlock(ItemStack stack, IBlockState state) {
|
||||
Material material = state.getMaterial();
|
||||
return material != Material.wood && material != Material.plants && material != Material.vine
|
||||
return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE
|
||||
? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial;
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemTRHoe extends ItemHoe implements ITexturedItem, IHandHeld
|
||||
{
|
||||
private ToolMaterial material = ToolMaterial.WOOD;
|
||||
|
|
|
@ -12,6 +12,7 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemTRPickaxe extends ItemPickaxe implements ITexturedItem , IHandHeld
|
||||
{
|
||||
private ToolMaterial material = ToolMaterial.WOOD;
|
||||
|
|
|
@ -12,6 +12,7 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemTRSpade extends ItemSpade implements ITexturedItem , IHandHeld
|
||||
{
|
||||
private ToolMaterial material = ToolMaterial.WOOD;
|
||||
|
|
|
@ -12,6 +12,7 @@ import reborncore.RebornCore;
|
|||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import net.minecraft.item.Item.ToolMaterial;
|
||||
public class ItemTRSword extends ItemSword implements ITexturedItem , IHandHeld
|
||||
{
|
||||
private ToolMaterial material = ToolMaterial.WOOD;
|
||||
|
|
|
@ -158,7 +158,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem
|
|||
// 0.8F, 1F);
|
||||
if (!world.isRemote)
|
||||
{
|
||||
world.setBlockState(pos, Blocks.air.getDefaultState(), 2);
|
||||
world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
|
||||
}
|
||||
return EnumActionResult.SUCCESS;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue