Merge pull request #91 from Parabot/development

[MERGE] Development into master
This commit is contained in:
Jeroen Ketelaar
2018-09-01 12:01:42 -05:00
committed by GitHub
5 changed files with 33 additions and 4 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
language: java language: java
jdk: jdk:
- oraclejdk7 - openjdk7
- oraclejdk8 - oraclejdk8
before_install: before_install:
@@ -27,7 +27,7 @@ notifications:
env: env:
global: global:
- PROVIDER_VERSION=1.21.3 - PROVIDER_VERSION=1.21.4
cache: cache:
directories: directories:
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>317-api-minified</artifactId> <artifactId>317-api-minified</artifactId>
<version>1.21.3</version> <version>1.21.4</version>
<name>Parabot 317-API-Minified</name> <name>Parabot 317-API-Minified</name>
<licenses> <licenses>
@@ -52,7 +52,7 @@ public class MenuAction {
* @param currentOutputIndex * @param currentOutputIndex
*/ */
public static void setCurrentOutputIndex(int currentOutputIndex) { public static void setCurrentOutputIndex(int currentOutputIndex) {
if (currentOutputIndex > outputs.length - 1) { if (currentOutputIndex > outputs.length) {
currentOutputIndex = 0; currentOutputIndex = 0;
} }
MenuAction.currentOutputIndex = currentOutputIndex; MenuAction.currentOutputIndex = currentOutputIndex;
@@ -0,0 +1,26 @@
package org.rev317.min.debug;
import org.parabot.core.paint.AbstractDebugger;
import org.rev317.min.api.methods.Skill;
import java.awt.*;
public class DSkills extends AbstractDebugger {
@Override
public void toggle() {
for (Skill skill : Skill.values()){
System.out.println(String.format("%s level: %d / %d", skill.getName(), skill.getLevel(), skill.getRealLevel()));
}
}
@Override
public boolean isEnabled() {
return false;
}
@Override
public void paint(Graphics graphics) {
}
}
@@ -34,6 +34,7 @@ public class BotMenu implements ActionListener {
JMenuItem npcs = newItem("Npcs"); JMenuItem npcs = newItem("Npcs");
JMenuItem objects = newItem("Objects"); JMenuItem objects = newItem("Objects");
JMenuItem players = newItem("Players"); JMenuItem players = newItem("Players");
JMenuItem skills = newItem("Skills");
debugger.addDebugger("Enable Actions", new DActions()); debugger.addDebugger("Enable Actions", new DActions());
debugger.addDebugger("Animation", new DAnimation()); debugger.addDebugger("Animation", new DAnimation());
@@ -48,6 +49,7 @@ public class BotMenu implements ActionListener {
debugger.addDebugger("Npcs", new DNpcs()); debugger.addDebugger("Npcs", new DNpcs());
debugger.addDebugger("Objects", new DSceneObjects()); debugger.addDebugger("Objects", new DSceneObjects());
debugger.addDebugger("Players", new DPlayers()); debugger.addDebugger("Players", new DPlayers());
debugger.addDebugger("Skills", new DSkills());
debug.add(actions); debug.add(actions);
actions.add(enableActions); actions.add(enableActions);
@@ -63,6 +65,7 @@ public class BotMenu implements ActionListener {
debug.add(npcs); debug.add(npcs);
debug.add(objects); debug.add(objects);
debug.add(players); debug.add(players);
debug.add(skills);
actions.addSeparator(); actions.addSeparator();