First pass 1.12 port

This commit is contained in:
Tom Elfring committed 2017-06-15 15:01:45 +02:00
1 parent 2c1532b293
commit 2eabbe4b38
107 files changed
+264 -195

No files matched your search

@@ -9,9 +9,11 @@ import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -36,7 +38,7 @@ public class ItemBlockOre extends ItemBlock
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag)
public void addInformation(ItemStack itemstack, World world, List<String> list, ITooltipFlag flag)
{
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
{