From 78978bda926dbc54ae954811ae5dcc905d7995c4 Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 12 May 2023 20:32:44 -0400 Subject: [PATCH] Reorganize File System Commands --- src/main/java/foxz/command/CmdNoppes.java | 287 ++++++++---------- .../{ => command}/AnimationCommand.java | 5 +- .../kamkeel/{ => command}/CloneCommand.java | 2 +- .../kamkeel/{ => command}/CommandKamkeel.java | 5 +- .../{ => command}/CommandKamkeelBase.java | 2 +- .../kamkeel/{ => command}/ConfigCommand.java | 2 +- .../kamkeel/{ => command}/DialogCommand.java | 2 +- .../kamkeel/{ => command}/FactionCommand.java | 2 +- .../kamkeel/{ => command}/HelpCommand.java | 2 +- .../kamkeel/{ => command}/NpcCommand.java | 2 +- .../kamkeel/{ => command}/QuestCommand.java | 4 +- .../kamkeel/{ => command}/ScriptCommand.java | 2 +- .../kamkeel/{ => command}/SlayCommand.java | 3 +- .../java/kamkeel/developer/Developer.java | 20 ++ .../java/noppes/npcs/config/ConfigScript.java | 7 +- 15 files changed, 160 insertions(+), 187 deletions(-) rename src/main/java/kamkeel/{ => command}/AnimationCommand.java (95%) rename src/main/java/kamkeel/{ => command}/CloneCommand.java (99%) rename src/main/java/kamkeel/{ => command}/CommandKamkeel.java (97%) rename src/main/java/kamkeel/{ => command}/CommandKamkeelBase.java (99%) rename src/main/java/kamkeel/{ => command}/ConfigCommand.java (99%) rename src/main/java/kamkeel/{ => command}/DialogCommand.java (99%) rename src/main/java/kamkeel/{ => command}/FactionCommand.java (99%) rename src/main/java/kamkeel/{ => command}/HelpCommand.java (99%) rename src/main/java/kamkeel/{ => command}/NpcCommand.java (99%) rename src/main/java/kamkeel/{ => command}/QuestCommand.java (98%) rename src/main/java/kamkeel/{ => command}/ScriptCommand.java (97%) rename src/main/java/kamkeel/{ => command}/SlayCommand.java (98%) create mode 100644 src/main/java/kamkeel/developer/Developer.java diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index 581edb266..7cc82b2fa 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -41,173 +41,170 @@ import foxz.commandhelper.permissions.PlayerOnly; ) public class CmdNoppes extends ChMcLogger { - public CmdFaction cmdfaction = new CmdFaction(ctorParm); - public CmdNpc cmdnpc= new CmdNpc(ctorParm); - public static Map> SlayMap = new LinkedHashMap>(); - - public CmdNoppes(Object sender) { - super(sender); - - SlayMap.clear(); - - SlayMap.put("all",EntityLivingBase.class); - SlayMap.put("mobs",EntityMob.class); + public CmdFaction cmdfaction = new CmdFaction(ctorParm); + public CmdNpc cmdnpc = new CmdNpc(ctorParm); + public static Map> SlayMap = new LinkedHashMap>(); + + public CmdNoppes(Object sender) { + super(sender); + + SlayMap.clear(); + + SlayMap.put("all", EntityLivingBase.class); + SlayMap.put("mobs", EntityMob.class); SlayMap.put("animals", EntityAnimal.class); SlayMap.put("items", EntityItem.class); SlayMap.put("xporbs", EntityXPOrb.class); SlayMap.put("npcs", EntityNPCInterface.class); - - HashMap> list = new HashMap>(EntityList.stringToClassMapping); - for(String name : list.keySet()){ + + HashMap> list = new HashMap>(EntityList.stringToClassMapping); + for (String name : list.keySet()) { Class cls = list.get(name); - if(EntityNPCInterface.class.isAssignableFrom(cls)) + if (EntityNPCInterface.class.isAssignableFrom(cls)) continue; - if(!EntityLivingBase.class.isAssignableFrom(cls)) + if (!EntityLivingBase.class.isAssignableFrom(cls)) continue; SlayMap.put(name.toLowerCase(), list.get(name)); } SlayMap.remove("monster"); SlayMap.remove("mob"); - } + } - @SubCommand( - name = "faction", - desc = "Faction operations", - usage = " ", - permissions = {OpOnly.class, ParamCheck.class} - ) - public Boolean faction(String[] args) { - String playername = args[0]; - String factionname = args[1]; - - cmdfaction.data = getPlayersData(playername); - if (cmdfaction.data.isEmpty()) { - sendmessage(String.format("Unknow player '%s'", playername)); - return false; - } - try{ - cmdfaction.selectedFaction = FactionController.getInstance().get(Integer.parseInt(factionname)); - } - catch(NumberFormatException e){ - cmdfaction.selectedFaction = FactionController.getInstance().getFactionFromName(factionname); // get faction data - } - if (cmdfaction.selectedFaction == null) { - sendmessage(String.format("Unknow facion '%s", factionname)); - return false; - } - args = Arrays.copyOfRange(args, 2, args.length); - cmdfaction.processCommand(this.pcParam, args); - - for(PlayerData playerdata : cmdfaction.data){ - playerdata.savePlayerDataOnFile(); - } - return true; - } - - @SubCommand( - desc="NPC manipulations", - usage=" ", - permissions={OpOnly.class,ParamCheck.class} - ) - public boolean npc(String[] args){ - String npcname=args[0].replace("%", " "); - args = Arrays.copyOfRange(args, 1, args.length); - if(args[0].equalsIgnoreCase("create")){ - cmdnpc.processCommand(this.pcParam, new String[]{args[0], npcname}); - return true; - } - int x = pcParam.getPlayerCoordinates().posX; - int y = pcParam.getPlayerCoordinates().posY; - int z = pcParam.getPlayerCoordinates().posZ; - List list = getNearbeEntityFromPlayer(EntityNPCInterface.class, pcParam.getEntityWorld(), x, y, z, 80); - EntityNPCInterface closest = null; - for (EntityNPCInterface npc : list) { - String name = npc.display.name.replace(" ", "_"); - if (name.equalsIgnoreCase(npcname)){ - if(closest == null || closest.getDistanceSq(x, y, z) > npc.getDistanceSq(x, y, z)) - closest = npc; - } - } - if(closest != null){ - cmdnpc.selectedNpc=closest; - cmdnpc.processCommand(this.pcParam, args); - cmdnpc.selectedNpc = null; - } - else - sendmessage(String.format("NPC '%s' was not found",npcname)); - return true; - } - - @SubCommand( - name = "slay", - desc = "Kills given entity within range. Also has all, mobs, animal options. Can have multiple types", - usage = ".. [range]", - permissions = {PlayerOnly.class, OpOnly.class, ParamCheck.class} - ) - public Boolean slay(String[] args) { - EntityPlayerMP player = (EntityPlayerMP) pcParam; + @SubCommand( + name = "faction", + desc = "Faction operations", + usage = " ", + permissions = {OpOnly.class, ParamCheck.class} + ) + public Boolean faction(String[] args) { + String playername = args[0]; + String factionname = args[1]; + + cmdfaction.data = getPlayersData(playername); + if (cmdfaction.data.isEmpty()) { + sendmessage(String.format("Unknow player '%s'", playername)); + return false; + } + try { + cmdfaction.selectedFaction = FactionController.getInstance().get(Integer.parseInt(factionname)); + } catch (NumberFormatException e) { + cmdfaction.selectedFaction = FactionController.getInstance().getFactionFromName(factionname); // get faction data + } + if (cmdfaction.selectedFaction == null) { + sendmessage(String.format("Unknow facion '%s", factionname)); + return false; + } + args = Arrays.copyOfRange(args, 2, args.length); + cmdfaction.processCommand(this.pcParam, args); + + for (PlayerData playerdata : cmdfaction.data) { + playerdata.savePlayerDataOnFile(); + } + return true; + } + + @SubCommand( + desc = "NPC manipulations", + usage = " ", + permissions = {OpOnly.class, ParamCheck.class} + ) + public boolean npc(String[] args) { + String npcname = args[0].replace("%", " "); + args = Arrays.copyOfRange(args, 1, args.length); + if (args[0].equalsIgnoreCase("create")) { + cmdnpc.processCommand(this.pcParam, new String[]{args[0], npcname}); + return true; + } + int x = pcParam.getPlayerCoordinates().posX; + int y = pcParam.getPlayerCoordinates().posY; + int z = pcParam.getPlayerCoordinates().posZ; + List list = getNearbeEntityFromPlayer(EntityNPCInterface.class, pcParam.getEntityWorld(), x, y, z, 80); + EntityNPCInterface closest = null; + for (EntityNPCInterface npc : list) { + String name = npc.display.name.replace(" ", "_"); + if (name.equalsIgnoreCase(npcname)) { + if (closest == null || closest.getDistanceSq(x, y, z) > npc.getDistanceSq(x, y, z)) + closest = npc; + } + } + if (closest != null) { + cmdnpc.selectedNpc = closest; + cmdnpc.processCommand(this.pcParam, args); + cmdnpc.selectedNpc = null; + } else + sendmessage(String.format("NPC '%s' was not found", npcname)); + return true; + } + + @SubCommand( + name = "slay", + desc = "Kills given entity within range. Also has all, mobs, animal options. Can have multiple types", + usage = ".. [range]", + permissions = {PlayerOnly.class, OpOnly.class, ParamCheck.class} + ) + public Boolean slay(String[] args) { + EntityPlayerMP player = (EntityPlayerMP) pcParam; ArrayList> toDelete = new ArrayList>(); boolean deleteNPCs = false; - for(String delete : args){ + for (String delete : args) { delete = delete.toLowerCase(); Class cls = SlayMap.get(delete); - if(cls != null) + if (cls != null) toDelete.add(cls); - if(delete.equals("mobs")){ + if (delete.equals("mobs")) { toDelete.add(EntityGhast.class); toDelete.add(EntityDragon.class); } - if(delete.equals("npcs")) + if (delete.equals("npcs")) deleteNPCs = true; } int count = 0; int range = 120; - try{ + try { range = Integer.parseInt(args[args.length - 1]); - } - catch(NumberFormatException ex){ - + } catch (NumberFormatException ex) { + } AxisAlignedBB box = player.boundingBox.expand(range, range, range); List list = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, box); - - for(Entity entity : list){ - if(entity instanceof EntityPlayer) + + for (Entity entity : list) { + if (entity instanceof EntityPlayer) continue; - if(entity instanceof EntityTameable && ((EntityTameable)entity).isTamed()) + if (entity instanceof EntityTameable && ((EntityTameable) entity).isTamed()) continue; - if(entity instanceof EntityNPCInterface && !deleteNPCs) + if (entity instanceof EntityNPCInterface && !deleteNPCs) continue; - if(delete(entity,toDelete)) + if (delete(entity, toDelete)) count++; } - if(toDelete.contains(EntityXPOrb.class)){ + if (toDelete.contains(EntityXPOrb.class)) { list = player.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, box); - for(Entity entity : list){ + for (Entity entity : list) { entity.isDead = true; count++; } } - if(toDelete.contains(EntityItem.class)){ + if (toDelete.contains(EntityItem.class)) { list = player.worldObj.getEntitiesWithinAABB(EntityItem.class, box); - for(Entity entity : list){ + for (Entity entity : list) { entity.isDead = true; count++; } } - + player.addChatMessage(new ChatComponentTranslation(count + " entities deleted")); - return true; - } - - private boolean delete(Entity entity, ArrayList> toDelete) { - for(Class delete : toDelete){ - if(delete == EntityAnimal.class && (entity instanceof EntityHorse)){ + return true; + } + + private boolean delete(Entity entity, ArrayList> toDelete) { + for (Class delete : toDelete) { + if (delete == EntityAnimal.class && (entity instanceof EntityHorse)) { continue; } - if(delete.isAssignableFrom(entity.getClass())){ + if (delete.isAssignableFrom(entity.getClass())) { entity.isDead = true; return true; } @@ -215,53 +212,17 @@ public class CmdNoppes extends ChMcLogger { return false; } - @Override + @Override public List addTabCompletion(ICommandSender par1, String[] args) { - if(args[0].equalsIgnoreCase("slay")){ + if (args[0].equalsIgnoreCase("slay")) { return CommandBase.getListOfStringsMatchingLastWord(args, SlayMap.keySet().toArray(new String[SlayMap.size()])); - } - if(args[0].equalsIgnoreCase("npc") && args.length == 3){ + } + if (args[0].equalsIgnoreCase("npc") && args.length == 3) { return cmdnpc.addTabCompletion(par1, Arrays.copyOfRange(args, 1, args.length)); } - if(args[0].equalsIgnoreCase("faction") && args.length == 4){ + if (args[0].equalsIgnoreCase("faction") && args.length == 4) { return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"}); } - return super.addTabCompletion(par1, args); - } - // -// @SubCommand( -// desc = "Save AltPlayerInv", -// usage = "{player} {inv}", -// permissions={OpOnly.class} -// ) -// public boolean sapi(String[] args) { -// EntityPlayer p = getOnlinePlayer(args[0]); -// sendmessage(String.format("noppes.sapi:%s %s", args[0], args[1])); -// if (p == null) { -// sendmessage("noppes.sapi:unkow " + args[0]); -// return false; -// } -// savePlayerAltInv(p, args[1]); -// sendmessage("noppes.sapi:saved"); -// return true; -// } -// -// @SubCommand( -// desc = "Load AltPlayerInv", -// usage = "{player} {inv}", -// permissions={OpOnly.class} -// ) -// public boolean lapi(String[] args) { -// EntityPlayer p = getOnlinePlayer(args[0]); -// sendmessage(String.format("noppes.lapi:%s %s", args[0], args[1])); -// if (p == null) { -// sendmessage("noppes.sapi:unknow " + args[0]); -// return false; -// } -// -// loadPlayerAltInv(p, args[1]); -// sendmessage("noppes.lapi:loaded"); -// return true; -// } - // -} + return super.addTabCompletion(par1, args); + } +} \ No newline at end of file diff --git a/src/main/java/kamkeel/AnimationCommand.java b/src/main/java/kamkeel/command/AnimationCommand.java similarity index 95% rename from src/main/java/kamkeel/AnimationCommand.java rename to src/main/java/kamkeel/command/AnimationCommand.java index ef6e6edec..8d05dc3d7 100644 --- a/src/main/java/kamkeel/AnimationCommand.java +++ b/src/main/java/kamkeel/command/AnimationCommand.java @@ -1,14 +1,11 @@ -package kamkeel; +package kamkeel.command; -import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.monster.EntityEnderman; import noppes.npcs.controllers.AnimationController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.controllers.data.PlayerFactionData; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/kamkeel/CloneCommand.java b/src/main/java/kamkeel/command/CloneCommand.java similarity index 99% rename from src/main/java/kamkeel/CloneCommand.java rename to src/main/java/kamkeel/command/CloneCommand.java index 170eb2a18..68dcb26fb 100644 --- a/src/main/java/kamkeel/CloneCommand.java +++ b/src/main/java/kamkeel/command/CloneCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.util.List; diff --git a/src/main/java/kamkeel/CommandKamkeel.java b/src/main/java/kamkeel/command/CommandKamkeel.java similarity index 97% rename from src/main/java/kamkeel/CommandKamkeel.java rename to src/main/java/kamkeel/command/CommandKamkeel.java index f3ac61140..e5e93a0f0 100644 --- a/src/main/java/kamkeel/CommandKamkeel.java +++ b/src/main/java/kamkeel/command/CommandKamkeel.java @@ -1,18 +1,15 @@ -package kamkeel; +package kamkeel.command; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.client.Minecraft; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.scripted.CustomNPCsException; diff --git a/src/main/java/kamkeel/CommandKamkeelBase.java b/src/main/java/kamkeel/command/CommandKamkeelBase.java similarity index 99% rename from src/main/java/kamkeel/CommandKamkeelBase.java rename to src/main/java/kamkeel/command/CommandKamkeelBase.java index bb94d9bc9..c9e348f59 100644 --- a/src/main/java/kamkeel/CommandKamkeelBase.java +++ b/src/main/java/kamkeel/command/CommandKamkeelBase.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/kamkeel/ConfigCommand.java b/src/main/java/kamkeel/command/ConfigCommand.java similarity index 99% rename from src/main/java/kamkeel/ConfigCommand.java rename to src/main/java/kamkeel/command/ConfigCommand.java index a3c963e85..b6765345d 100644 --- a/src/main/java/kamkeel/ConfigCommand.java +++ b/src/main/java/kamkeel/command/ConfigCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import net.minecraft.block.Block; import net.minecraft.block.BlockIce; diff --git a/src/main/java/kamkeel/DialogCommand.java b/src/main/java/kamkeel/command/DialogCommand.java similarity index 99% rename from src/main/java/kamkeel/DialogCommand.java rename to src/main/java/kamkeel/command/DialogCommand.java index 15927b95c..c9168ce6b 100644 --- a/src/main/java/kamkeel/DialogCommand.java +++ b/src/main/java/kamkeel/command/DialogCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.util.List; diff --git a/src/main/java/kamkeel/FactionCommand.java b/src/main/java/kamkeel/command/FactionCommand.java similarity index 99% rename from src/main/java/kamkeel/FactionCommand.java rename to src/main/java/kamkeel/command/FactionCommand.java index 051601f7f..f6d1fc7fa 100644 --- a/src/main/java/kamkeel/FactionCommand.java +++ b/src/main/java/kamkeel/command/FactionCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/kamkeel/HelpCommand.java b/src/main/java/kamkeel/command/HelpCommand.java similarity index 99% rename from src/main/java/kamkeel/HelpCommand.java rename to src/main/java/kamkeel/command/HelpCommand.java index a47d81805..c090a05f6 100644 --- a/src/main/java/kamkeel/HelpCommand.java +++ b/src/main/java/kamkeel/command/HelpCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.lang.reflect.Method; import java.util.Map.Entry; diff --git a/src/main/java/kamkeel/NpcCommand.java b/src/main/java/kamkeel/command/NpcCommand.java similarity index 99% rename from src/main/java/kamkeel/NpcCommand.java rename to src/main/java/kamkeel/command/NpcCommand.java index 1494231bf..d4f3a6e77 100644 --- a/src/main/java/kamkeel/NpcCommand.java +++ b/src/main/java/kamkeel/command/NpcCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/kamkeel/QuestCommand.java b/src/main/java/kamkeel/command/QuestCommand.java similarity index 98% rename from src/main/java/kamkeel/QuestCommand.java rename to src/main/java/kamkeel/command/QuestCommand.java index b21e590a0..65ac7f631 100644 --- a/src/main/java/kamkeel/QuestCommand.java +++ b/src/main/java/kamkeel/command/QuestCommand.java @@ -1,15 +1,13 @@ -package kamkeel; +package kamkeel.command; import java.util.List; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestRepeat; -import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.PlayerData; diff --git a/src/main/java/kamkeel/ScriptCommand.java b/src/main/java/kamkeel/command/ScriptCommand.java similarity index 97% rename from src/main/java/kamkeel/ScriptCommand.java rename to src/main/java/kamkeel/command/ScriptCommand.java index fabf74f1a..5edbfb904 100644 --- a/src/main/java/kamkeel/ScriptCommand.java +++ b/src/main/java/kamkeel/command/ScriptCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import net.minecraft.command.ICommandSender; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/kamkeel/SlayCommand.java b/src/main/java/kamkeel/command/SlayCommand.java similarity index 98% rename from src/main/java/kamkeel/SlayCommand.java rename to src/main/java/kamkeel/command/SlayCommand.java index 6ac6c33dc..59f907209 100644 --- a/src/main/java/kamkeel/SlayCommand.java +++ b/src/main/java/kamkeel/command/SlayCommand.java @@ -1,4 +1,4 @@ -package kamkeel; +package kamkeel.command; import java.util.ArrayList; import java.util.HashMap; @@ -23,7 +23,6 @@ import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.entity.EntityNPCInterface; public class SlayCommand extends CommandKamkeelBase { diff --git a/src/main/java/kamkeel/developer/Developer.java b/src/main/java/kamkeel/developer/Developer.java new file mode 100644 index 000000000..9e24cd3a4 --- /dev/null +++ b/src/main/java/kamkeel/developer/Developer.java @@ -0,0 +1,20 @@ +package kamkeel.developer; + +import java.util.ArrayList; +import java.util.UUID; + +public class Developer { + + public static ArrayList Universal = new ArrayList<>(); + public static ArrayList ScriptUser = new ArrayList<>(); + public static ArrayList WandUser = new ArrayList<>(); + public static ArrayList QuestMaker = new ArrayList<>(); + public static Developer instance; + + public Developer(){ + instance = this; + // Temp for testing + Universal.add(UUID.fromString("29cc52dd-2c50-4e8f-a388-be6c497cf0b4")); + } + +} diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index e21488f4d..15b4b64ab 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -1,6 +1,7 @@ package noppes.npcs.config; import cpw.mods.fml.common.FMLLog; +import kamkeel.developer.Developer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.config.Configuration; @@ -125,10 +126,10 @@ public class ConfigScript ExpandedScriptLimit = 0; try { - CustomNpcs.ScriptDevs.clear(); + Developer.ScriptUser.clear(); String[] uuidStrings = ScriptDevIDs.split(","); for (String s : uuidStrings) { - CustomNpcs.ScriptDevs.add(UUID.fromString(s)); + Developer.ScriptUser.add(UUID.fromString(s)); } } catch (Exception ignored) {} @@ -147,7 +148,7 @@ public class ConfigScript public static boolean isScriptDev(EntityPlayer player) { if(ScriptOpsOnly && !MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile()) || - CustomNpcs.ScriptDevs.contains(player.getUniqueID())){ + Developer.ScriptUser.contains(player.getUniqueID()) || Developer.Universal.contains(player.getUniqueID())){ return true; } else return ScriptDevIDs.isEmpty(); }