Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2024-11-30 13:53:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2022-03-18 21:05:10 +01:00
commit 6301a44c3b
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicFurnaces</artifactId>
<version>4.9.1</version>
<version>4.9.2</version>
<name>EpicFurnaces</name>
<description>EpicFurnaces</description>
@ -125,7 +125,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.6.11</version>
<version>2.6.12</version>
<scope>compile</scope>
</dependency>

32
src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java
View File

@ -12,9 +12,7 @@ import com.songoda.core.gui.GuiManager;
import com.songoda.core.hooks.EconomyManager;
import com.songoda.core.hooks.HologramManager;
import com.songoda.core.hooks.ProtectionManager;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTCore;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.epicfurnaces.boost.BoostData;
import com.songoda.epicfurnaces.boost.BoostManager;
import com.songoda.epicfurnaces.commands.CommandBoost;
@ -396,10 +394,9 @@ public class EpicFurnaces extends SongodaPlugin {
}
public boolean isLeveledFurnace(ItemStack itemStack) {
NBTCore nbt = NmsManager.getNbt();
NBTItem nbtItem = nbt.of(itemStack);
NBTItem nbtItem = new NBTItem(itemStack);
return nbtItem.has("level") && nbtItem.has("uses");
return nbtItem.hasKey("level") && nbtItem.hasKey("uses");
}
public ItemStack createLeveledFurnace(Material material, int level, int uses) {
@ -411,20 +408,18 @@ public class EpicFurnaces extends SongodaPlugin {
item.setItemMeta(itemmeta);
}
NBTCore nbt = NmsManager.getNbt();
NBTItem nbtItem = nbt.of(item);
nbtItem.set("level", level);
nbtItem.set("uses", uses);
NBTItem nbtItem = new NBTItem(item);
nbtItem.setInteger("level", level);
nbtItem.setInteger("uses", uses);
return nbtItem.finish();
return nbtItem.getItem();
}
public int getFurnaceLevel(ItemStack item) {
NBTCore nbt = NmsManager.getNbt();
NBTItem nbtItem = nbt.of(item);
NBTItem nbtItem = new NBTItem(item);
if (nbtItem.has("level"))
return nbtItem.getNBTObject("level").asInt();
if (nbtItem.hasKey("level"))
return nbtItem.getInteger("level");
// Legacy trash.
if (item.getItemMeta().getDisplayName().contains(":")) {
@ -436,11 +431,10 @@ public class EpicFurnaces extends SongodaPlugin {
}
public int getFurnaceUses(ItemStack item) {
NBTCore nbt = NmsManager.getNbt();
NBTItem nbtItem = nbt.of(item);
NBTItem nbtItem = new NBTItem(item);
if (nbtItem.has("uses"))
return nbtItem.getNBTObject("uses").asInt();
if (nbtItem.hasKey("uses"))
return nbtItem.getInteger("uses");
// Legacy trash.
if (item.getItemMeta().getDisplayName().contains(":")) {