Begin 1.11 (compiles, does not run yet)

This commit is contained in:
mezz committed 2017-02-08 00:52:37 -08:00
1 parent 5310003659
commit 424fdaaf48
164 files changed
+1396 -1312

No files matched your search

@@ -10,14 +10,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemDictionary extends Item implements IItemModelRegister {
public ItemDictionary() {
@@ -29,7 +27,7 @@ public class ItemDictionary extends Item implements IItemModelRegister {
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List<ItemStack> par3List) {
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
super.getSubItems(par1, par2CreativeTabs, par3List);
par3List.add(new ItemStack(par1, 1, 1));
}
@@ -42,13 +40,14 @@ public class ItemDictionary extends Item implements IItemModelRegister {
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) {
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
ItemStack itemStack = playerIn.getHeldItem(handIn);
if (itemStack.getMetadata() == 0) {
Botany.proxy.openGui(BotanyGUI.Database, player, player.getPosition());
Botany.proxy.openGui(BotanyGUI.Database, playerIn, playerIn.getPosition());
} else {
Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, player.getPosition());
Botany.proxy.openGui(BotanyGUI.DatabaseNEI, playerIn, playerIn.getPosition());
}
return ActionResult.newResult(EnumActionResult.SUCCESS, itemStack);
return super.onItemRightClick(worldIn, playerIn, handIn);
}
@Override