Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 12:05:16 +01:00
Code Issues Projects Releases Wiki Activity

Cat is not a real thing.

Browse Source
This commit is contained in:
Zrips 2019-08-16 16:53:10 +03:00
parent f7acc20d2a
commit d801dd43ea
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -63,7 +63,7 @@ public class ItemManager {
String bukkitName = one.name();
String mojangName = one.name();
;
try {
mojangName = ItemReflection.getItemMinecraftName(new ItemStack(mat));
} catch (Throwable e) {
@ -632,7 +632,6 @@ public class ItemManager {
ENDERMITE(67, "Endermite"),
GUARDIAN(68, "Guardian"),
SHULKER(69, "Shulker"),
CAT(75, "Cat"),
PIG(90, "Pig"),
SHEEP(91, "Sheep"),
COW(92, "Cow"),
@ -641,7 +640,7 @@ public class ItemManager {
WOLF(95, "Wolf"),
MUSHROOM_COW(96, "Mushroom Cow", "Mooshroom"),
SNOWMAN(97, "Snowman"),
OCELOT(98, "Ocelot"),
OCELOT(98, "Ocelot", "Cat"),
IRON_GOLEM(99, "Iron Golem"),
HORSE(100, "Horse"),
RABBIT(101, "Rabbit"),
@ -733,7 +732,7 @@ public class ItemManager {
}
public static CMIEntityType getByName(String name) {
String main = name;
String main = name;
String sub = null;
if (name.contains("_")) {
@ -753,7 +752,7 @@ public class ItemManager {
Integer id = null;
try {
id = Integer.parseInt(main);
} catch (Throwable e) {
} catch (Exception e) {
}
for (CMIEntityType one : CMIEntityType.values()) {
@ -762,6 +761,20 @@ public class ItemManager {
break;
}
}
if (type == null)
for (CMIEntityType one : CMIEntityType.values()) {
if (one.secondaryName == null)
continue;
String oneN = one.secondaryName;
oneN = oneN.replace("_", "");
if (oneN.equalsIgnoreCase(name)) {
type = one;
break;
}
}
if (type == null)
for (CMIEntityType one : CMIEntityType.values()) {
if (one.name.replace("_", "").contains(updated)) {
@ -806,18 +819,6 @@ public class ItemManager {
break;
}
}
if (type == null)
for (CMIEntityType one : CMIEntityType.values()) {
if (one.secondaryName == null)
continue;
String oneN = one.secondaryName;
oneN = oneN.replace("_", "");
if (oneN.equalsIgnoreCase(name)) {
type = one;
break;
}
}
return type;
}