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

Small things

Browse Source
This commit is contained in:
Zrips 2017-06-23 12:08:39 +03:00
parent 979fcb7195
commit 1684b6da2b
3 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/java/com/gamingmesh/jobs/CmiItems/ItemManager.java
View File

@ -2,7 +2,9 @@ package com.gamingmesh.jobs.CmiItems;
import java.util.HashMap;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
import com.gamingmesh.jobs.Jobs;
@ -35,7 +37,7 @@ public class ItemManager {
byMaterial.put(one, cm);
}
for (itemNames one : itemNames.values()) {
for (CMIMaterial one : CMIMaterial.values()) {
proccessItemName(one);
}
}
@ -64,7 +66,7 @@ public class ItemManager {
} catch (Exception e) {
}
}
if (name.contains("-")) {
name = name.split("-")[0];
try {
@ -88,7 +90,7 @@ public class ItemManager {
}
}
if (cm == null) {
for (itemNames one : itemNames.values()) {
for (CMIMaterial one : CMIMaterial.values()) {
if (one.getName().replace(" ", "").equalsIgnoreCase(name)) {
cm = byId.get(one.getId());
if (cm != null) {
@ -98,7 +100,7 @@ public class ItemManager {
}
}
if (cm == null) {
for (itemNames one : itemNames.values()) {
for (CMIMaterial one : CMIMaterial.values()) {
if (one.getName().replace(" ", "").toLowerCase().startsWith(name)) {
cm = byId.get(one.getId());
if (cm != null) {
@ -109,7 +111,7 @@ public class ItemManager {
}
}
if (cm == null) {
for (itemNames one : itemNames.values()) {
for (CMIMaterial one : CMIMaterial.values()) {
if (one.getName().replace(" ", "").toLowerCase().contains(name)) {
cm = byId.get(one.getId());
@ -141,27 +143,27 @@ public class ItemManager {
return cm.getMaterial();
}
public itemNames getRealName(CMIItem item) {
public CMIMaterial getRealName(CMIItem item) {
return getRealName(item, false);
}
public itemNames getRealName(CMIItem item, boolean safe) {
for (itemNames one : itemNames.values()) {
public CMIMaterial getRealName(CMIItem item, boolean safe) {
for (CMIMaterial one : CMIMaterial.values()) {
if (one.getId() == item.getId() && one.getData() == item.getData())
return one;
}
return safe ? itemNames.air_0_0 : null;
return safe ? CMIMaterial.air_0_0 : null;
}
private static itemNames proccessItemName(itemNames one) {
private static CMIMaterial proccessItemName(CMIMaterial one) {
if (one.getName().contains("[colorNames]"))
one.setName(one.getName().replace("[colorNames]", colorNames.getById(one.getData()).getName()));
one.setName(one.getName().replace("[colorNames]", CMIChatColor.getById(one.getData()).getName()));
else if (one.getName().contains("[entityNames]"))
one.setName(one.getName().replace("[entityNames]", entityNames.getById(one.getData()).getName()));
one.setName(one.getName().replace("[entityNames]", CMIEntityType.getById(one.getData()).getName()));
return one;
}
public enum colorNames {
public enum CMIChatColor {
White(0, "White"),
Orange(1, "Orange"),
Magenta(2, "Magenta"),
@ -182,7 +184,7 @@ public class ItemManager {
private int id;
private String name;
colorNames(int id, String name) {
CMIChatColor(int id, String name) {
this.id = id;
this.name = name;
}
@ -191,20 +193,24 @@ public class ItemManager {
return id;
}
public static String translate(String msg) {
return ChatColor.translateAlternateColorCodes('&', msg);
}
public String getName() {
return name;
}
public static colorNames getById(int id) {
for (colorNames one : colorNames.values()) {
public static CMIChatColor getById(int id) {
for (CMIChatColor one : CMIChatColor.values()) {
if (one.getId() == id)
return one;
}
return colorNames.White;
return CMIChatColor.White;
}
}
public enum entityNames {
public enum CMIEntityType {
elder_guardian(4, "Elder Guardian"),
wither_skeleton(5, "Wither Skeleton"),
stray(6, "Stray"),
@ -215,7 +221,7 @@ public class ItemManager {
armor_stand(30, "Armor Stand"),
donkey(31, "Donkey"),
mule(32, "Mule"),
evocation_illager(34, "Evocation illager"),
evocation_illager(34, "Evocation Illager"),
vex(35, "Vex"),
vindication_illager(36, "Vindication Illager"),
illusion_illager(37, "Illusion Illager"),
@ -245,10 +251,10 @@ public class ItemManager {
chicken(93, "Chicken"),
squid(94, "Squid"),
wolf(95, "Wolf"),
mooshroom(96, "Mooshroom"),
mushroom_cow(96, "Mushroom Cow"),
snowman(97, "Snowman"),
ocelot(98, "Ocelot"),
villager_golem(99, "Villager"),
villager_golem(99, "Iron Golem"),
horse(100, "Horse"),
rabbit(101, "Rabbit"),
polar_bear(102, "Polar Bear"),
@ -259,7 +265,7 @@ public class ItemManager {
private int id;
private String name;
entityNames(int id, String name) {
CMIEntityType(int id, String name) {
this.id = id;
this.name = name;
}
@ -272,16 +278,43 @@ public class ItemManager {
return name;
}
public static entityNames getById(int id) {
for (entityNames one : entityNames.values()) {
public EntityType getType() {
for (EntityType one : EntityType.values()) {
if (one.getTypeId() == this.getId())
return one;
}
return null;
}
public static CMIEntityType getById(int id) {
for (CMIEntityType one : CMIEntityType.values()) {
if (one.getId() == id)
return one;
}
return entityNames.pig;
return null;
}
public static CMIEntityType getByName(String name) {
name = name.toLowerCase().replace("_", "");
CMIEntityType type = null;
for (CMIEntityType one : CMIEntityType.values()) {
if (one.name().equalsIgnoreCase(name) || one.name.replace(" ", "").equalsIgnoreCase(name)) {
type = one;
break;
}
}
if (type == null)
for (CMIEntityType one : CMIEntityType.values()) {
if (one.name.contains(name)) {
type = one;
break;
}
}
return type;
}
}
public enum itemNames {
public enum CMIMaterial {
air_0_0(0, 0, "Unknown"),
stone_1_0(1, 0, "Stone"),
stone_1_1(1, 1, "Granite"),
@ -1065,7 +1098,7 @@ public class ItemManager {
private int data;
private String name;
itemNames(int id, int data, String name) {
CMIMaterial(int id, int data, String name) {
this.id = id;
this.data = data;
this.name = name;

3
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -35,6 +35,7 @@ import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
@ -795,7 +796,7 @@ public class Jobs extends JavaPlugin {
setMyPetManager();
setWorldGuard();
setMythicManager();
if (MythicManager != null && MythicManager.Check() && GconfigManager.MythicMobsEnabled) {
MythicManager.registerListener();

13
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -36,6 +36,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.CmiItems.ItemManager.CMIEntityType;
import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.BoostMultiplier;
import com.gamingmesh.jobs.container.CurrencyType;
@ -49,6 +50,7 @@ import com.gamingmesh.jobs.container.JobLimitedItems;
import com.gamingmesh.jobs.container.JobPermission;
import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
public class ConfigManager {
private Jobs plugin;
@ -153,7 +155,7 @@ public class ConfigManager {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid ChatColour property. Defaulting to WHITE!");
}
}
String bossbar = null;
if (jobSection.contains("BossBarColour")) {
bossbar = jobSection.getString("BossBarColour", "");
@ -162,7 +164,7 @@ public class ConfigManager {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid BossBarColour property.");
}
}
DisplayMethod displayMethod = DisplayMethod.matchMethod(jobSection.getString("chat-display", ""));
if (displayMethod == null) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid chat-display property. Defaulting to None!");
@ -353,14 +355,14 @@ public class ConfigManager {
enchants.put(ench, level);
}
BoostMultiplier b = new BoostMultiplier();
BoostMultiplier b = new BoostMultiplier();
if (itemSection.isDouble("moneyBoost"))
b.add(CurrencyType.MONEY, itemSection.getDouble("moneyBoost") - 1);
if (itemSection.isDouble("pointBoost"))
b.add(CurrencyType.POINTS, itemSection.getDouble("pointBoost") - 1);
if (itemSection.isDouble("expBoost"))
b.add(CurrencyType.EXP, itemSection.getDouble("expBoost") - 1);
b.add(CurrencyType.EXP, itemSection.getDouble("expBoost") - 1);
jobItems.add(new JobItems(node, id, 0, 1, name, lore, enchants, b));
}
}
@ -492,6 +494,7 @@ public class ConfigManager {
type = material.toString();
id = material.getId();
} else if (actionType == ActionType.KILL || actionType == ActionType.TAME || actionType == ActionType.BREED || actionType == ActionType.MILK) {
// check entities
EntityType entity = EntityType.fromName(key);
if (entity == null) {