mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Got rid of "is Similar" - as mc 1.13 now used a Material for every Item

Browse Source 
This one is WIP as all the colours & wood & stone types have to be re-added.
Please also take a look
This commit is contained in:
MisterErwin 2018-09-04 18:41:34 +02:00 committed by TheBusyBiscuit
parent 83f3fb4c4b
commit 60b08ac917
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java
View File

@ -56,7 +56,16 @@ public class SlimefunManager {
} }
} }
public static List<Material> data_safe = Arrays.asList(Material.WOOL, Material.CARPET, Material.STAINED_CLAY, Material.STAINED_GLASS, Material.STAINED_GLASS_PANE, Material.INK_SACK, Material.STONE, Material.COAL, Material.SKULL_ITEM, Material.RAW_FISH, Material.COOKED_FISH); //ToDO: ALl all
//Charcoal=coal?
// public static List<Material> data_safe = Arrays.asList(Material.WHITE_WOOL,
// Material.WHITE_CARPET,
// Material.WHITE_TERRACOTTA,
// Material.WHITE_STAINED_GLASS,
// Material.WHITE_STAINED_GLASS_PANE,
// Material.INK_SAC,
// Material.STONE,
// Material.COAL, Material.SKULL_ITEM, Material.RAW_FISH, Material.COOKED_FISH);
public static boolean isItemSimiliar(ItemStack item, ItemStack SFitem, boolean lore) { public static boolean isItemSimiliar(ItemStack item, ItemStack SFitem, boolean lore) {
return isItemSimiliar(item, SFitem, lore, DataType.IF_COLORED); return isItemSimiliar(item, SFitem, lore, DataType.IF_COLORED);
@ -76,16 +85,17 @@ public class SlimefunManager {
if (SFitem == null) return false; if (SFitem == null) return false;
if (item.getType() == SFitem.getType() && item.getAmount() >= SFitem.getAmount()) { if (item.getType() == SFitem.getType() && item.getAmount() >= SFitem.getAmount()) {
if (data.equals(DataType.ALWAYS) || (data.equals(DataType.IF_COLORED) && data_safe.contains(item.getType()))) { //ToDo: Removed data_safe - is that correct?
if (data_safe.contains(item.getType())) { // if (data.equals(DataType.ALWAYS) || (data.equals(DataType.IF_COLORED) && data_safe.contains(item.getType()))) {
if (item.getData().getData() != SFitem.getData().getData()) { // if (data_safe.contains(item.getType())) {
if (!(SFitem.getDurability() == item.getData().getData() && SFitem.getData().getData() == item.getDurability())) return false; // if (item.getData().getData() != SFitem.getData().getData()) {
} // if (!(SFitem.getDurability() == item.getData().getData() && SFitem.getData().getData() == item.getDurability())) return false;
} // }
else if (data.equals(DataType.ALWAYS) && item.getDurability() != SFitem.getDurability()) { // }
return false; // else if (data.equals(DataType.ALWAYS) && item.getDurability() != SFitem.getDurability()) {
} // return false;
} // }
// }
if (item.hasItemMeta() && SFitem.hasItemMeta()) { if (item.hasItemMeta() && SFitem.hasItemMeta()) {
if (item.getItemMeta().hasDisplayName() && SFitem.getItemMeta().hasDisplayName()) { if (item.getItemMeta().hasDisplayName() && SFitem.getItemMeta().hasDisplayName()) {