mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Less memory usage for "not unlocked" messages
This commit is contained in:
parent
e388bf01f1
commit
911903e4a2
@ -16,6 +16,7 @@ import me.mrCookieSlime.Slimefun.Objects.Category;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.Research;
|
import me.mrCookieSlime.Slimefun.Objects.Research;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem.State;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem.State;
|
||||||
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem;
|
||||||
import me.mrCookieSlime.Slimefun.Setup.Messages;
|
import me.mrCookieSlime.Slimefun.Setup.Messages;
|
||||||
|
|
||||||
public class Slimefun {
|
public class Slimefun {
|
||||||
@ -60,9 +61,10 @@ public class Slimefun {
|
|||||||
|
|
||||||
public static boolean hasUnlocked(Player p, ItemStack item, boolean message) {
|
public static boolean hasUnlocked(Player p, ItemStack item, boolean message) {
|
||||||
SlimefunItem sfItem = SlimefunItem.getByItem(item);
|
SlimefunItem sfItem = SlimefunItem.getByItem(item);
|
||||||
|
State state = SlimefunItem.getState(item);
|
||||||
if (sfItem == null) {
|
if (sfItem == null) {
|
||||||
if (SlimefunItem.isDisabled(item)) {
|
if (SlimefunItem.isDisabled(item)) {
|
||||||
if (message && SlimefunItem.getState(item).equals(State.DISABLED)) Messages.local.sendTranslation(p, "messages.disabled-item", true);
|
if (message && state != State.VANILLA) Messages.local.sendTranslation(p, "messages.disabled-item", true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else return true;
|
else return true;
|
||||||
@ -71,7 +73,7 @@ public class Slimefun {
|
|||||||
if (sfItem.getResearch() == null) return true;
|
if (sfItem.getResearch() == null) return true;
|
||||||
else if (sfItem.getResearch().hasUnlocked(p)) return true;
|
else if (sfItem.getResearch().hasUnlocked(p)) return true;
|
||||||
else {
|
else {
|
||||||
if (message && sfItem.getState().equals(State.DISABLED)) Messages.local.sendTranslation(p, "messages.not-researched", true);
|
if (message && !(sfItem instanceof VanillaItem)) Messages.local.sendTranslation(p, "messages.not-researched", true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -83,7 +85,7 @@ public class Slimefun {
|
|||||||
if (sfItem.getResearch() == null) return true;
|
if (sfItem.getResearch() == null) return true;
|
||||||
else if (sfItem.getResearch().hasUnlocked(p)) return true;
|
else if (sfItem.getResearch().hasUnlocked(p)) return true;
|
||||||
else {
|
else {
|
||||||
if (message && sfItem.getState().equals(State.DISABLED)) Messages.local.sendTranslation(p, "messages.not-researched", true);
|
if (message && !(sfItem instanceof VanillaItem)) Messages.local.sendTranslation(p, "messages.not-researched", true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user