From 9710878a5e08f87c10505274d52030e9313f8da0 Mon Sep 17 00:00:00 2001 From: AnthonyAMC Date: Sun, 1 Dec 2013 08:15:38 -0500 Subject: [PATCH] Blind attempt at 1.7.2 update --- pom.xml | 4 ++-- .../net/worldoftomorrow/noitem/events/Handlers.java | 12 ++++++------ .../net/worldoftomorrow/noitem/util/NMSMethods.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 6b395ba..bfd0aec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.worldoftomorrow NoItem - 3.0.8 + 3.0.9 jar NoItem @@ -35,7 +35,7 @@ org.bukkit craftbukkit - 1.6.4-R0.1-SNAPSHOT + 1.7.2-R0.1-SNAPSHOT Vault diff --git a/src/main/java/net/worldoftomorrow/noitem/events/Handlers.java b/src/main/java/net/worldoftomorrow/noitem/events/Handlers.java index 02176cb..7336b6d 100644 --- a/src/main/java/net/worldoftomorrow/noitem/events/Handlers.java +++ b/src/main/java/net/worldoftomorrow/noitem/events/Handlers.java @@ -4,9 +4,9 @@ import java.util.HashMap; import java.util.Map; -import net.minecraft.server.v1_6_R3.Item; -import net.minecraft.server.v1_6_R3.RecipesFurnace; -import net.minecraft.server.v1_6_R3.TileEntityFurnace; +import net.minecraft.server.v1_7_R1.Item; +import net.minecraft.server.v1_7_R1.RecipesFurnace; +import net.minecraft.server.v1_7_R1.TileEntityFurnace; import net.worldoftomorrow.noitem.NoItem; import net.worldoftomorrow.noitem.permissions.Perm; import net.worldoftomorrow.noitem.util.Util; @@ -17,7 +17,7 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; @@ -569,13 +569,13 @@ private static Player getPlayerFromEntity(HumanEntity ent) { private static boolean isFuel(ItemStack item) { // Create an NMS item stack - net.minecraft.server.v1_6_R3.ItemStack nmss = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_7_R1.ItemStack nmss = CraftItemStack.asNMSCopy(item); // Use the NMS TileEntityFurnace to check if the item being clicked is a fuel return TileEntityFurnace.isFuel(nmss); } private static boolean isCookable(ItemStack item) { - net.minecraft.server.v1_6_R3.ItemStack nmss = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_7_R1.ItemStack nmss = CraftItemStack.asNMSCopy(item); // If the result of that item being cooked is null, it is not cookable return RecipesFurnace.getInstance().getResult(nmss.getItem().id) != null; } diff --git a/src/main/java/net/worldoftomorrow/noitem/util/NMSMethods.java b/src/main/java/net/worldoftomorrow/noitem/util/NMSMethods.java index 20f9812..a735417 100644 --- a/src/main/java/net/worldoftomorrow/noitem/util/NMSMethods.java +++ b/src/main/java/net/worldoftomorrow/noitem/util/NMSMethods.java @@ -1,10 +1,10 @@ package net.worldoftomorrow.noitem.util; -import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftItemStack; -import net.minecraft.server.v1_6_R3.Item; -import net.minecraft.server.v1_6_R3.PotionBrewer; -import net.minecraft.server.v1_6_R3.ItemStack; +import net.minecraft.server.v1_7_R1.Item; +import net.minecraft.server.v1_7_R1.PotionBrewer; +import net.minecraft.server.v1_7_R1.ItemStack; public class NMSMethods {