Skip to content

Commit

Permalink
Blind attempt at 1.7.2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
AnthonyAMC committed Dec 1, 2013
1 parent 8408230 commit 9710878
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -4,7 +4,7 @@

<groupId>net.worldoftomorrow</groupId>
<artifactId>NoItem</artifactId>
<version>3.0.8</version>
<version>3.0.9</version>
<packaging>jar</packaging>

<name>NoItem</name>
Expand Down Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.6.4-R0.1-SNAPSHOT</version>
<version>1.7.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>Vault</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/worldoftomorrow/noitem/events/Handlers.java
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions 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 {

Expand Down

0 comments on commit 9710878

Please sign in to comment.