JUFS/Tplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constant naming conventions fix

Browse Source
This commit is contained in:
batchprogrammer314
2021-06-26 20:00:57 -05:00
parent 26959ace6c
commit 4450592e23
7 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/nuggetmc/ai/PlayerAI.java
View File

@@ -14,14 +14,14 @@ public class PlayerAI extends JavaPlugin {
private static PlayerAI instance; private static PlayerAI instance;
private final CommandHandler HANDLER; private final CommandHandler handler;
private final NPCManager MANAGER; private final NPCManager manager;
public PlayerAI() { public PlayerAI() {
instance = this; instance = this;
this.HANDLER = new CommandHandler(); this.handler = new CommandHandler();
this.MANAGER = new NPCManager(this); this.manager = new NPCManager(this);
} }
public static PlayerAI getInstance() { public static PlayerAI getInstance() {
@@ -29,29 +29,29 @@ public class PlayerAI extends JavaPlugin {
} }
public CommandHandler getHandler() { public CommandHandler getHandler() {
return HANDLER; return handler;
} }
public NPCManager getManager() { public NPCManager getManager() {
return MANAGER; return manager;
} }
@Override @Override
public void onEnable() { public void onEnable() {
getServer().getPluginManager().registerEvents(MANAGER, this); getServer().getPluginManager().registerEvents(manager, this);
registerCommands(); registerCommands();
MANAGER.connectAll(); manager.connectAll();
} }
@Override @Override
public void onDisable() { public void onDisable() {
MANAGER.reset(); manager.reset();
MANAGER.disconnectAll(); manager.disconnectAll();
} }
private void registerCommands() { private void registerCommands() {
HANDLER.register(new CommandInterface[] { handler.register(new CommandInterface[] {
new CreateCommand(), new CreateCommand(),
new InfoCommand(), new InfoCommand(),
new DebugCommand(), new DebugCommand(),
@@ -61,8 +61,8 @@ public class PlayerAI extends JavaPlugin {
PluginCommand command = getCommand("playerai"); PluginCommand command = getCommand("playerai");
if (command != null) { if (command != null) {
command.setExecutor(HANDLER); command.setExecutor(handler);
command.setTabCompleter(HANDLER); command.setTabCompleter(handler);
} }
} }
} }

18
src/net/nuggetmc/ai/cmd/CommandHandler.java
View File

@@ -10,13 +10,13 @@ import java.util.*;
public class CommandHandler implements CommandExecutor, TabCompleter { public class CommandHandler implements CommandExecutor, TabCompleter {
private final Map<String, CommandInterface> COMMANDS = new HashMap<>(); private final Map<String, CommandInterface> commands = new HashMap<>();
private final String PREFIX = "bot"; private final String prefix = "bot";
public void register(CommandInterface[] subCmds) { public void register(CommandInterface[] subCmds) {
for (CommandInterface cmd : subCmds) { for (CommandInterface cmd : subCmds) {
COMMANDS.put(cmd.getName(), cmd); commands.put(cmd.getName(), cmd);
} }
} }
@@ -26,11 +26,11 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
} }
private boolean exists(String name) { private boolean exists(String name) {
return COMMANDS.containsKey(name.toLowerCase()); return commands.containsKey(name.toLowerCase());
} }
private CommandInterface getExecutor(String name) { private CommandInterface getExecutor(String name) {
return COMMANDS.get(name.toLowerCase()); return commands.get(name.toLowerCase());
} }
public String nonPlayerMsg() { public String nonPlayerMsg() {
@@ -38,7 +38,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
} }
public String usageMsg(CommandInterface subCmd) { public String usageMsg(CommandInterface subCmd) {
return ChatColor.RED + "Invalid arguments!\nUsage: /" + PREFIX + " " + subCmd.getName() + " " + subCmd.getUsage(); return ChatColor.RED + "Invalid arguments!\nUsage: /" + prefix + " " + subCmd.getName() + " " + subCmd.getUsage();
} }
private void sendCmdInfo(CommandSender sender) { private void sendCmdInfo(CommandSender sender) {
@@ -46,8 +46,8 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
sender.sendMessage(ChatColor.GOLD + "PlayerAI" + ChatColor.GRAY + " [" + ChatColor.RED + "v1.0" + ChatColor.GRAY + "]"); sender.sendMessage(ChatColor.GOLD + "PlayerAI" + ChatColor.GRAY + " [" + ChatColor.RED + "v1.0" + ChatColor.GRAY + "]");
for (Map.Entry<String, CommandInterface> entry : COMMANDS.entrySet()) { for (Map.Entry<String, CommandInterface> entry : commands.entrySet()) {
sender.sendMessage(ChatColor.GRAY + " ▪ " + ChatColor.YELLOW + "/" + PREFIX + " " + entry.getKey() + ChatColor.GRAY + " ▪ " sender.sendMessage(ChatColor.GRAY + " ▪ " + ChatColor.YELLOW + "/" + prefix + " " + entry.getKey() + ChatColor.GRAY + " ▪ "
+ ChatColor.RESET + entry.getValue().getDescription()); + ChatColor.RESET + entry.getValue().getDescription());
} }
@@ -74,7 +74,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
switch (n) { switch (n) {
case 1: case 1:
groupnames = new ArrayList<>(COMMANDS.keySet()); groupnames = new ArrayList<>(commands.keySet());
String arg = args[n - 1]; String arg = args[n - 1];
if (!isEmptyTab(arg)) { if (!isEmptyTab(arg)) {

18
src/net/nuggetmc/ai/cmd/commands/DebugCommand.java
View File

@@ -12,30 +12,30 @@ import java.util.Set;
public class DebugCommand implements CommandInterface { public class DebugCommand implements CommandInterface {
private final CommandHandler HANDLER; private final CommandHandler handler;
private final String NAME; private final String name;
private final String DESCRIPTION = "Debug NPC stats."; private final String description = "Debug NPC stats.";
private final String CMD_ARGS = ""; private final String cmdArgs = "";
public DebugCommand() { public DebugCommand() {
this.HANDLER = PlayerAI.getInstance().getHandler(); this.handler = PlayerAI.getInstance().getHandler();
this.NAME = HANDLER.fetchName(this); this.name = handler.fetchName(this);
} }
@Override @Override
public String getName() { public String getName() {
return NAME; return name;
} }
@Override @Override
public String getDescription() { public String getDescription() {
return DESCRIPTION; return description;
} }
@Override @Override
public String getUsage() { public String getUsage() {
return CMD_ARGS; return cmdArgs;
} }
private boolean active = false; private boolean active = false;

18
src/net/nuggetmc/ai/cmd/commands/InfoCommand.java
View File

@@ -8,30 +8,30 @@ import org.bukkit.command.CommandSender;
public class InfoCommand implements CommandInterface { public class InfoCommand implements CommandInterface {
private final CommandHandler HANDLER; private final CommandHandler handler;
private final String NAME; private final String name;
private final String DESCRIPTION = "Information about loaded NPCs."; private final String description = "Information about loaded NPCs.";
private final String CMD_ARGS = ""; private final String cmdArgs = "";
public InfoCommand() { public InfoCommand() {
this.HANDLER = PlayerAI.getInstance().getHandler(); this.handler = PlayerAI.getInstance().getHandler();
this.NAME = HANDLER.fetchName(this); this.name = handler.fetchName(this);
} }
@Override @Override
public String getName() { public String getName() {
return NAME; return name;
} }
@Override @Override
public String getDescription() { public String getDescription() {
return DESCRIPTION; return description;
} }
@Override @Override
public String getUsage() { public String getUsage() {
return CMD_ARGS; return cmdArgs;
} }
@Override @Override

30
src/net/nuggetmc/ai/cmd/commands/ResetCommand.java
View File

@@ -13,43 +13,43 @@ import java.util.Locale;
public class ResetCommand implements CommandInterface { public class ResetCommand implements CommandInterface {
private final PlayerAI INSTANCE; private final PlayerAI plugin;
private final CommandHandler HANDLER; private final CommandHandler handler;
private final NPCManager MANAGER; private final NPCManager manager;
private final String NAME; private final String name;
private final String DESCRIPTION = "Information about loaded NPCs."; private final String description = "Information about loaded NPCs.";
private final String CMD_ARGS = ""; private final String cmdArgs = "";
public ResetCommand() { public ResetCommand() {
this.INSTANCE = PlayerAI.getInstance(); this.plugin = PlayerAI.getInstance();
this.HANDLER = INSTANCE.getHandler(); this.handler = plugin.getHandler();
this.MANAGER = INSTANCE.getManager(); this.manager = plugin.getManager();
this.NAME = HANDLER.fetchName(this); this.name = handler.fetchName(this);
} }
@Override @Override
public String getName() { public String getName() {
return NAME; return name;
} }
@Override @Override
public String getDescription() { public String getDescription() {
return DESCRIPTION; return description;
} }
@Override @Override
public String getUsage() { public String getUsage() {
return CMD_ARGS; return cmdArgs;
} }
@Override @Override
public void onCommand(CommandSender sender, Command cmd, String label, String[] args) { public void onCommand(CommandSender sender, Command cmd, String label, String[] args) {
sender.sendMessage("Removing every NPC..."); sender.sendMessage("Removing every NPC...");
int size = MANAGER.fetch().size(); int size = manager.fetch().size();
MANAGER.reset(); manager.reset();
String en; String en;
if (size == 1) { if (size == 1) {

16
src/net/nuggetmc/ai/npc/NPC.java
View File

@@ -25,7 +25,7 @@ public class NPC extends EntityPlayer {
private byte kbTicks; private byte kbTicks;
private final double REGEN_AMOUNT = 0.05; private final double regenAmount = 0.05;
public NPC(MinecraftServer minecraftServer, WorldServer worldServer, GameProfile profile, PlayerInteractManager manager) { public NPC(MinecraftServer minecraftServer, WorldServer worldServer, GameProfile profile, PlayerInteractManager manager) {
super(minecraftServer, worldServer, profile, manager); super(minecraftServer, worldServer, profile, manager);
@@ -116,8 +116,8 @@ public class NPC extends EntityPlayer {
double maxHealth = playerNPC.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); double maxHealth = playerNPC.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue();
double amount; double amount;
if (health < maxHealth - REGEN_AMOUNT) { if (health < maxHealth - regenAmount) {
amount = health + REGEN_AMOUNT; amount = health + regenAmount;
} else { } else {
amount = maxHealth; amount = maxHealth;
} }
@@ -138,7 +138,7 @@ public class NPC extends EntityPlayer {
this.move(EnumMoveType.SELF, new Vec3D(velocity.getX(), velocity.getY(), velocity.getZ())); this.move(EnumMoveType.SELF, new Vec3D(velocity.getX(), velocity.getY(), velocity.getZ()));
} }
private final double OFFSET = 0.05; private final double bbOffset = 0.05;
public boolean predictGround() { public boolean predictGround() {
double vy = velocity.getY(); double vy = velocity.getY();
@@ -153,13 +153,13 @@ public class NPC extends EntityPlayer {
AxisAlignedBB box = getBoundingBox(); AxisAlignedBB box = getBoundingBox();
double[] xVals = new double[] { double[] xVals = new double[] {
box.minX + OFFSET, box.minX + bbOffset,
box.maxX - OFFSET box.maxX - bbOffset
}; };
double[] zVals = new double[] { double[] zVals = new double[] {
box.minZ + OFFSET, box.minZ + bbOffset,
box.maxZ - OFFSET box.maxZ - bbOffset
}; };
for (double x : xVals) { for (double x : xVals) {

20
src/net/nuggetmc/ai/npc/NPCManager.java
View File

@@ -24,18 +24,18 @@ public class NPCManager implements Listener {
private PlayerAI plugin; private PlayerAI plugin;
private final Set<NPC> NPCS = new HashSet<>(); private final Set<NPC> npcs = new HashSet<>();
private final Map<Integer, NPC> NPC_CONNECTIONS = new HashMap<>(); private final Map<Integer, NPC> npcConnections = new HashMap<>();
public Set<NPC> fetch() { public Set<NPC> fetch() {
return NPCS; return npcs;
} }
public void add(NPC npc) { public void add(NPC npc) {
NPCS.add(npc); npcs.add(npc);
Bukkit.getScheduler().runTaskLater(PlayerAI.getInstance(), () -> { Bukkit.getScheduler().runTaskLater(PlayerAI.getInstance(), () -> {
NPC_CONNECTIONS.put(npc.getId(), npc); npcConnections.put(npc.getId(), npc);
}, 10); }, 10);
} }
@@ -44,19 +44,19 @@ public class NPCManager implements Listener {
} }
public void reset() { public void reset() {
for (NPC npc : NPCS) { for (NPC npc : npcs) {
npc.despawn(); npc.despawn();
} }
NPCS.clear(); npcs.clear();
NPC_CONNECTIONS.clear(); npcConnections.clear();
} }
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
PlayerConnection connection = ((CraftPlayer) event.getPlayer()).getHandle().playerConnection; PlayerConnection connection = ((CraftPlayer) event.getPlayer()).getHandle().playerConnection;
for (NPC npc : NPCS) { for (NPC npc : npcs) {
npc.render(connection, true); npc.render(connection, true);
} }
@@ -128,7 +128,7 @@ public class NPCManager implements Listener {
if (!(obj instanceof Integer)) return; if (!(obj instanceof Integer)) return;
int n = (int) obj; int n = (int) obj;
NPC npc = NPC_CONNECTIONS.get(n); NPC npc = npcConnections.get(n);
if (npc == null) return; if (npc == null) return;
connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, npc)); connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, npc));