diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 56feb5e..a9136e6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 1.5 - 1.8 + 1.7 @@ -56,8 +56,8 @@ maven-compiler-plugin 2.3.2 - 1.8 - 1.8 + 1.7 + 1.7 diff --git a/script-factory.iml b/script-factory.iml index 7c230dd..4da4e99 100644 --- a/script-factory.iml +++ b/script-factory.iml @@ -1,6 +1,6 @@ - + @@ -11,7 +11,6 @@ - @@ -21,5 +20,7 @@ + + \ No newline at end of file diff --git a/src/main/java/scriptfactory/Actions/Action.java b/src/main/java/scriptfactory/Actions/Action.java index af559b5..770bbac 100644 --- a/src/main/java/scriptfactory/Actions/Action.java +++ b/src/main/java/scriptfactory/Actions/Action.java @@ -50,7 +50,12 @@ public class Action { public int[] getParamArray() { - return params.stream().mapToInt(Integer::parseInt).toArray(); + int[] array = new int[params.size()]; + for (int i = 0; i < params.size(); i++) { + array[i] = Integer.parseInt(params.get(i)); + } + return array; + //return params.stream().mapToInt(Integer::parseInt).toArray(); } public Action(String action, ArrayList inputs) { diff --git a/src/main/java/scriptfactory/Actions/ActionHandler.java b/src/main/java/scriptfactory/Actions/ActionHandler.java index d695861..c5a83aa 100644 --- a/src/main/java/scriptfactory/Actions/ActionHandler.java +++ b/src/main/java/scriptfactory/Actions/ActionHandler.java @@ -1,5 +1,6 @@ package scriptfactory.Actions; +import org.parabot.environment.api.utils.Filter; import org.parabot.environment.api.utils.Time; import org.parabot.environment.input.Keyboard; import org.parabot.environment.input.Mouse; @@ -97,9 +98,14 @@ public class ActionHandler { Time.sleep(a.getParam(2)); } - public void handleGroundItemInteract(Action a) { + public void handleGroundItemInteract(final Action a) { try { - GroundItem item = GroundItems.getNearest(o -> o.getId() == a.getParam(0))[0]; + GroundItem item = GroundItems.getNearest(new Filter() { + @Override + public boolean accept(GroundItem o) { + return o.getId() == a.getParam(0); + } + })[0]; if (item == null) { log("Could not find item with id" + a.getParam(0)); @@ -121,20 +127,40 @@ public class ActionHandler { Bank.depositAllExcept(a.getParamArray()); } - private void interactWithEntity(int[] id, String option) + private void interactWithEntity(final int[] id, String option) { SceneObject candidateObject = SceneObjects.getClosest(id); - Npc candidateNpc = Npcs.getClosest(o -> !o.isInCombat() && Arrays.stream(id).anyMatch(i -> i == o.getDef().getId())); + Npc candidateNpc = Npcs.getClosest(new Filter() { + @Override + public boolean accept(Npc o) { + for (int i1 : id) { + if (o.getDef().getId() == i1) { + return !o.isInCombat(); + } + } + return false; + } + }); debugString = "id: " + Arrays.toString(id); tryToInteract(candidateObject, candidateNpc, option); } - private void interactWithEntityByTile(Tile tile, String option) { - SceneObject[] sos = SceneObjects.getNearest(o -> o.getLocation().equals(tile)); + private void interactWithEntityByTile(final Tile tile, String option) { + SceneObject[] sos = SceneObjects.getNearest(new Filter() { + @Override + public boolean accept(SceneObject o) { + return o.getLocation().equals(tile); + } + }); SceneObject candidateObject = null; if (sos.length > 0) candidateObject = sos[0]; - Npc[] npca = Npcs.getNearest(o -> o.getLocation().equals(tile)); + Npc[] npca = Npcs.getNearest(new Filter() { + @Override + public boolean accept(Npc o) { + return o.getLocation().equals(tile); + } + }); Npc candidateNpc = null; if (npca.length > 0) candidateNpc = npca[0]; diff --git a/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java b/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java index 1728f4a..df46e5d 100644 --- a/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java +++ b/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java @@ -1,5 +1,7 @@ package scriptfactory.Actions.Logic; +import org.parabot.environment.api.utils.Filter; +import org.rev317.min.api.wrappers.GroundItem; import scriptfactory.Actions.Action; import org.rev317.min.api.methods.*; @@ -9,7 +11,7 @@ import static scriptfactory.VarsMethods.log; import static scriptfactory.VarsMethods.toPintArray; public class LogicHandler { - public boolean determineIf(Action a) { + public boolean determineIf(final Action a) { switch (a.getMethod().replaceAll("-", " ")) { case "Item is in Inventory": @@ -17,7 +19,12 @@ public class LogicHandler { case "Inventory slots used": return Inventory.getCount() >= a.getParam(0); case "Item is on Ground": - return GroundItems.getGroundItems(o-> o.getId() == a.getParam(0)).length > 0; + return GroundItems.getGroundItems(new Filter() { + @Override + public boolean accept(GroundItem o) { + return o.getId() == a.getParam(0); + } + }).length > 0; case "Entity is around": ArrayList ids = new ArrayList<>(); for (int i = 0; i < a.getParamCount(); i++) diff --git a/src/main/java/scriptfactory/AdvancedGui/AdvancedOptionsGUI.java b/src/main/java/scriptfactory/AdvancedGui/AdvancedOptionsGUI.java index 81845fc..c70b00f 100644 --- a/src/main/java/scriptfactory/AdvancedGui/AdvancedOptionsGUI.java +++ b/src/main/java/scriptfactory/AdvancedGui/AdvancedOptionsGUI.java @@ -2,15 +2,17 @@ package scriptfactory.AdvancedGui; import scriptfactory.Actions.Action; import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactorySDNGui; +import scriptfactory.Consumer; import scriptfactory.GUI.EnterJButton; import scriptfactory.NewGuis.UncommonActionGuiInfo; import scriptfactory.VarsMethods; import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import java.util.ArrayList; -import java.util.function.Consumer; import static scriptfactory.NewGuis.NewStatementGUI.addEscapeHotkey; import static scriptfactory.VarsMethods.log; @@ -71,8 +73,8 @@ public class AdvancedOptionsGUI extends JFrame { } private void generateMoveLineFrame() { - JTextField lineToMove = new JTextField(6); - JTextField lineToInsertAbove = new JTextField(6); + final JTextField lineToMove = new JTextField(6); + final JTextField lineToInsertAbove = new JTextField(6); EnterJButton submitMove = new EnterJButton("Submit"); moveLineFrame.setLayout(new GridLayout(5, 1, 5, 15)); @@ -87,49 +89,64 @@ public class AdvancedOptionsGUI extends JFrame { moveLineFrame.pack(); - submitMove.addActionListener(b -> - { - int lineToMoveAsPint = VarsMethods.parsePint(lineToMove.getText()); - int lineToPlaceAboveAsPint = VarsMethods.parsePint(lineToInsertAbove.getText()); + submitMove.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent b) { + int lineToMoveAsPint = VarsMethods.parsePint(lineToMove.getText()); + int lineToPlaceAboveAsPint = VarsMethods.parsePint(lineToInsertAbove.getText()); - Action removed = actions.remove(lineToMoveAsPint); - if (lineToPlaceAboveAsPint <= lineToMoveAsPint) - actions.add(lineToPlaceAboveAsPint, removed); - else - if (lineToPlaceAboveAsPint > actions.size()) + Action removed = actions.remove(lineToMoveAsPint); + if (lineToPlaceAboveAsPint <= lineToMoveAsPint) + actions.add(lineToPlaceAboveAsPint, removed); + else if (lineToPlaceAboveAsPint > actions.size()) actions.add(removed); else actions.add(lineToPlaceAboveAsPint - 1, removed); - updateTextfield.accept(5); - moveLineFrame.setVisible(false); - log("Successfully moved line " + lineToMove.getText() + "."); + updateTextfield.accept(5); + moveLineFrame.setVisible(false); + log("Successfully moved line " + lineToMove.getText() + "."); + } }); } private void initButtons() { - tipsAndTricksButton.addActionListener(o -> { - tipsFrame.setVisible(true); - this.setVisible(false); + tipsAndTricksButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + tipsFrame.setVisible(true); + AdvancedOptionsGUI.this.setVisible(false); + } }); - moveLineButton.addActionListener(o -> { - moveLineFrame.setVisible(true); - this.setVisible(false); + moveLineButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + moveLineFrame.setVisible(true); + AdvancedOptionsGUI.this.setVisible(false); + } }); - recoverPreviousScript.addActionListener(o -> - { - VarsMethods.loadscript(actions, new File(VarsMethods.CACHED_LOC)); - updateTextfield.accept(5); - this.setVisible(false); + recoverPreviousScript.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + VarsMethods.loadscript(actions, new File(VarsMethods.CACHED_LOC)); + updateTextfield.accept(5); + AdvancedOptionsGUI.this.setVisible(false); + } }); - uncommonActionButton.addActionListener(o -> { - uncommonActionGui.setVisible(true); - this.setVisible(false); + uncommonActionButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + uncommonActionGui.setVisible(true); + AdvancedOptionsGUI.this.setVisible(false); + } }); - premadeScriptsButton.addActionListener(o -> { - sdnGui.setVisible(true); - this.setVisible(false); + premadeScriptsButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + sdnGui.setVisible(true); + AdvancedOptionsGUI.this.setVisible(false); + } }); } diff --git a/src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.java b/src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.java index 3c01dad..9f46ddd 100644 --- a/src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.java +++ b/src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.java @@ -9,6 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeCellRenderer; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.io.File; import java.io.FileNotFoundException; @@ -169,20 +171,26 @@ public class ScriptFactorySDNGui extends JFrame { JButton cmdStart = new JButton("Download"); cmdStart.setBounds(WIDTH - 156 - 4, HEIGHT - 24 - 4, 156, 24); - cmdStart.addActionListener(e -> { - String s = getScriptName(tree.getSelectionPath().toString()); - downloadScript(format.get(s)); - JOptionPane.showMessageDialog(null, "Script downloaded successfully. You can now run it by clicking \"Load\" in the main menu."); + cmdStart.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + String s = ScriptFactorySDNGui.this.getScriptName(tree.getSelectionPath().toString()); + ScriptFactorySDNGui.this.downloadScript(format.get(s)); + JOptionPane.showMessageDialog(null, "Script downloaded successfully. You can now run it by clicking \"Load\" in the main menu."); + } }); JButton cmdHome = new JButton("Open home"); cmdHome.setBounds(WIDTH - (96 * 2 + 60) - 4 - 32, HEIGHT - 24 - 4, 96 + 32, 24); - cmdHome.addActionListener(e -> { - try { - Desktop.getDesktop().open(new File(DEFAULT_DIR)); - } catch (Exception ex) { - ex.printStackTrace(); + cmdHome.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + try { + Desktop.getDesktop().open(new File(DEFAULT_DIR)); + } catch (Exception ex) { + ex.printStackTrace(); + } } }); diff --git a/src/main/java/scriptfactory/Consumer.java b/src/main/java/scriptfactory/Consumer.java new file mode 100644 index 0000000..d8ef6a2 --- /dev/null +++ b/src/main/java/scriptfactory/Consumer.java @@ -0,0 +1,5 @@ +package scriptfactory; + +public interface Consumer { + void accept(T t); +} diff --git a/src/main/java/scriptfactory/GUI/EnterJButton.java b/src/main/java/scriptfactory/GUI/EnterJButton.java index 06ea90e..f25180b 100644 --- a/src/main/java/scriptfactory/GUI/EnterJButton.java +++ b/src/main/java/scriptfactory/GUI/EnterJButton.java @@ -8,7 +8,7 @@ public class EnterJButton extends JButton { public EnterJButton(String text) { super(text); - EnterJButton me = this; + final EnterJButton me = this; this.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent keyEvent) { diff --git a/src/main/java/scriptfactory/GUI/GUI.java b/src/main/java/scriptfactory/GUI/GUI.java index 6f29c9f..8992a43 100644 --- a/src/main/java/scriptfactory/GUI/GUI.java +++ b/src/main/java/scriptfactory/GUI/GUI.java @@ -4,6 +4,7 @@ import scriptfactory.Actions.Logic.If; import scriptfactory.Actions.Logic.Endif; import scriptfactory.Actions.Action; import scriptfactory.Actions.Logic.IfNot; +import scriptfactory.Consumer; import scriptfactory.GUI.MainPanels.ActionPanel; import scriptfactory.AdvancedGui.AdvancedOptionsGUI; import scriptfactory.NewGuis.ActionGuiInfo; @@ -14,12 +15,14 @@ import javax.swing.*; import javax.swing.border.EtchedBorder; import javax.swing.text.BadLocationException; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.*; import java.util.ArrayList; -import java.util.function.Consumer; import static scriptfactory.VarsMethods.log; + /** * Created by Cyn on 1/9/2018. */ @@ -41,12 +44,12 @@ public class GUI extends JFrame { private AdvancedOptionsGUI advancedOptions; private ArrayList actions; - public GUI(ArrayList actions) + public GUI(final ArrayList actions) { this.actions = actions; //These are like little functions we pass around - Consumer updateTextfield = (Integer i) -> { + /*Consumer updateTextfield = (Integer i) -> { updateActionList(); }; Consumer removeAction = (Integer toRemove) -> { @@ -58,6 +61,28 @@ public class GUI extends JFrame { Consumer endIf = (Boolean remove) -> { actions.add(new Endif()); updateTextfield.accept(1); + };*/ + final Consumer updateTextfield = new Consumer() { + @Override + public void accept(Integer i) { + GUI.this.updateActionList(); + } + }; + Consumer removeAction = new Consumer() { + @Override + public void accept(Integer toRemove) { + log("Trying to remove " + toRemove); + int pint = toRemove; + actions.remove(pint); + GUI.this.updateActionList(); + } + }; + Consumer endIf = new Consumer() { + @Override + public void accept(Boolean remove) { + actions.add(new Endif()); + updateTextfield.accept(1); + } }; newAction = new ActionGuiInfo(actions, updateTextfield); @@ -82,34 +107,45 @@ public class GUI extends JFrame { } private void addActionListeners() { - startButton.addActionListener(o -> { - this.setVisible(false); - log("Executing the following script:"); - for (Action a : actions) - { - log(a.toString()); + startButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + GUI.this.setVisible(false); + log("Executing the following script:"); + for (Action a : actions) { + log(a.toString()); + } + VarsMethods.tickSpeed = VarsMethods.parsePint(tickSpeedField.getText()); + selectedFile = new File(VarsMethods.CACHED_LOC); + GUI.this.saveContents(); + scriptStarted = true; } - VarsMethods.tickSpeed = VarsMethods.parsePint(tickSpeedField.getText()); - selectedFile = new File(VarsMethods.CACHED_LOC); - saveContents(); - scriptStarted = true; }); - saveButton.addActionListener(o -> { - if (updateFile()) - saveContents(); + saveButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + if (GUI.this.updateFile()) + GUI.this.saveContents(); + } }); - loadButton.addActionListener(o -> { - if (updateFile()) - loadContents(); + loadButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + if (GUI.this.updateFile()) + GUI.this.loadContents(); + } }); - addSleepButton.addActionListener(o -> { - ArrayList sleepAmountFieldAsAL = new ArrayList<>(); - sleepAmountFieldAsAL.add(sleepAmountField); - actions.add(new Action("Sleep", sleepAmountFieldAsAL)); - updateActionList(); + addSleepButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + ArrayList sleepAmountFieldAsAL = new ArrayList<>(); + sleepAmountFieldAsAL.add(sleepAmountField); + actions.add(new Action("Sleep", sleepAmountFieldAsAL)); + GUI.this.updateActionList(); + } }); } diff --git a/src/main/java/scriptfactory/GUI/MainPanels/ActionPanel.java b/src/main/java/scriptfactory/GUI/MainPanels/ActionPanel.java index d34e7ca..67f3be9 100644 --- a/src/main/java/scriptfactory/GUI/MainPanels/ActionPanel.java +++ b/src/main/java/scriptfactory/GUI/MainPanels/ActionPanel.java @@ -1,5 +1,6 @@ package scriptfactory.GUI.MainPanels; +import scriptfactory.Consumer; import scriptfactory.GUI.EnterJButton; import scriptfactory.AdvancedGui.AdvancedOptionsGUI; import scriptfactory.NewGuis.ActionGuiInfo; @@ -10,7 +11,8 @@ import javax.swing.*; import javax.swing.text.Style; import javax.swing.text.StyleConstants; import java.awt.*; -import java.util.function.Consumer; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** * Created by SRH on 1/10/2018. @@ -65,26 +67,41 @@ public class ActionPanel extends JPanel { } private void initButtons() { - actionButton.addActionListener(o -> { - newAction.setVisible(true); + actionButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + newAction.setVisible(true); + } }); - startIfButton.addActionListener(o -> { - newCondition.setVisible(true); + startIfButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + newCondition.setVisible(true); + } }); - endIfButton.addActionListener(o -> { - endIf.accept(true); + endIfButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + endIf.accept(true); + } }); - removeButton.addActionListener(o -> { - String path = JOptionPane.showInputDialog("Enter the line# you wish to delete:"); + removeButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + String path = JOptionPane.showInputDialog("Enter the line# you wish to delete:"); - removeAction.accept(VarsMethods.parsePint(path)); + removeAction.accept(VarsMethods.parsePint(path)); + } }); - advancedButton.addActionListener(o -> { - advancedOptions.setVisible(true); + advancedButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + advancedOptions.setVisible(true); + } }); } } diff --git a/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java b/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java index ee7dabe..e90a0b5 100644 --- a/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java +++ b/src/main/java/scriptfactory/NewGuis/ActionGuiInfo.java @@ -3,9 +3,9 @@ package scriptfactory.NewGuis; import scriptfactory.Actions.Action; +import scriptfactory.Consumer; import java.util.ArrayList; -import java.util.function.Consumer; /** * Created by SRH on 1/9/2018. diff --git a/src/main/java/scriptfactory/NewGuis/ConditionGuiInfo.java b/src/main/java/scriptfactory/NewGuis/ConditionGuiInfo.java index 904266f..91b3ae2 100644 --- a/src/main/java/scriptfactory/NewGuis/ConditionGuiInfo.java +++ b/src/main/java/scriptfactory/NewGuis/ConditionGuiInfo.java @@ -2,8 +2,9 @@ package scriptfactory.NewGuis; import scriptfactory.Actions.Action; +import scriptfactory.Consumer; + import java.util.ArrayList; -import java.util.function.Consumer; /** * Created by SRH on 1/9/2018. diff --git a/src/main/java/scriptfactory/NewGuis/NewStatementGUI.java b/src/main/java/scriptfactory/NewGuis/NewStatementGUI.java index 017fd13..3f876f9 100644 --- a/src/main/java/scriptfactory/NewGuis/NewStatementGUI.java +++ b/src/main/java/scriptfactory/NewGuis/NewStatementGUI.java @@ -3,15 +3,16 @@ package scriptfactory.NewGuis; import scriptfactory.Actions.Action; import scriptfactory.Actions.Logic.If; import scriptfactory.Actions.Logic.IfNot; +import scriptfactory.Consumer; import scriptfactory.GUI.EnterJButton; import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.ArrayList; -import java.util.function.Consumer; import static scriptfactory.VarsMethods.MAX_PARAMS; @@ -37,7 +38,7 @@ public class NewStatementGUI extends JFrame { * @param actionTypes: List of possible actions the user can select * @param descStrings: Descriptions to display for the actions */ - void initGui(String title, ArrayList actionList, Consumer updateTextfield, String[] actionTypes, Descriptions[] descStrings) { + void initGui(String title, final ArrayList actionList, final Consumer updateTextfield, String[] actionTypes, Descriptions[] descStrings) { setTitle(title); setLayout(new BorderLayout()); @@ -59,20 +60,26 @@ public class NewStatementGUI extends JFrame { addEscapeHotkey(this); - add.addActionListener(o -> { - if (this.getTitle().contains("action")) - actionList.add(new Action(selectedAction, inputs)); - else - actionList.add(new If(selectedAction, inputs)); - updateTextfield.accept(5); - this.setVisible(false); - clearInputs(); + add.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + if (NewStatementGUI.this.getTitle().contains("action")) + actionList.add(new Action(selectedAction, inputs)); + else + actionList.add(new If(selectedAction, inputs)); + updateTextfield.accept(5); + NewStatementGUI.this.setVisible(false); + NewStatementGUI.this.clearInputs(); + } }); - addInverse.addActionListener(o -> { - actionList.add(new IfNot(selectedAction, inputs)); - updateTextfield.accept(5); - this.setVisible(false); - clearInputs(); + addInverse.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + actionList.add(new IfNot(selectedAction, inputs)); + updateTextfield.accept(5); + NewStatementGUI.this.setVisible(false); + NewStatementGUI.this.clearInputs(); + } }); } @@ -82,15 +89,18 @@ public class NewStatementGUI extends JFrame { * @param actionTypes: scriptfactory.Actions user can select * @param descs: Field descriptions for that action */ - private JComboBox actionTypeCombo(String[] actionTypes, Descriptions[] descs) { - JComboBox actionType = new JComboBox(actionTypes); + private JComboBox actionTypeCombo(String[] actionTypes, final Descriptions[] descs) { + final JComboBox actionType = new JComboBox(actionTypes); selectedAction = actionTypes[0]; //prevents null setupInputFields(descs[0]); - actionType.addActionListener(o -> { - selectedAction = actionType.getSelectedItem().toString(); + actionType.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent o) { + selectedAction = actionType.getSelectedItem().toString(); - setupInputFields(descs[actionType.getSelectedIndex()]); + NewStatementGUI.this.setupInputFields(descs[actionType.getSelectedIndex()]); + } }); return actionType; @@ -145,7 +155,7 @@ public class NewStatementGUI extends JFrame { * Currently supports Tab, Shift Tab * @param textArea current TextArea to operate on */ - private void setHKNavigation(JTextArea textArea) { + private void setHKNavigation(final JTextArea textArea) { textArea.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent keyEvent) { @@ -160,8 +170,13 @@ public class NewStatementGUI extends JFrame { }); } - public static void addEscapeHotkey(JFrame temp) { - ActionListener escListener = e -> temp.setVisible(false); + public static void addEscapeHotkey(final JFrame temp) { + ActionListener escListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + temp.setVisible(false); + } + }; temp.getRootPane().registerKeyboardAction(escListener, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); diff --git a/src/main/java/scriptfactory/NewGuis/UncommonActionGuiInfo.java b/src/main/java/scriptfactory/NewGuis/UncommonActionGuiInfo.java index 8281b97..3e9e104 100644 --- a/src/main/java/scriptfactory/NewGuis/UncommonActionGuiInfo.java +++ b/src/main/java/scriptfactory/NewGuis/UncommonActionGuiInfo.java @@ -1,9 +1,9 @@ package scriptfactory.NewGuis; import scriptfactory.Actions.Action; +import scriptfactory.Consumer; import java.util.ArrayList; -import java.util.function.Consumer; public class UncommonActionGuiInfo extends NewStatementGUI { public UncommonActionGuiInfo(ArrayList actionList, Consumer updateTextField) diff --git a/target/classes/scriptfactory/Actions/Action.class b/target/classes/scriptfactory/Actions/Action.class index 05826ec..0e697e9 100644 Binary files a/target/classes/scriptfactory/Actions/Action.class and b/target/classes/scriptfactory/Actions/Action.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$1.class b/target/classes/scriptfactory/Actions/ActionHandler$1.class new file mode 100644 index 0000000..363945b Binary files /dev/null and b/target/classes/scriptfactory/Actions/ActionHandler$1.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$2.class b/target/classes/scriptfactory/Actions/ActionHandler$2.class new file mode 100644 index 0000000..3f21742 Binary files /dev/null and b/target/classes/scriptfactory/Actions/ActionHandler$2.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$3.class b/target/classes/scriptfactory/Actions/ActionHandler$3.class new file mode 100644 index 0000000..bd8ed2a Binary files /dev/null and b/target/classes/scriptfactory/Actions/ActionHandler$3.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler$4.class b/target/classes/scriptfactory/Actions/ActionHandler$4.class new file mode 100644 index 0000000..de693c8 Binary files /dev/null and b/target/classes/scriptfactory/Actions/ActionHandler$4.class differ diff --git a/target/classes/scriptfactory/Actions/ActionHandler.class b/target/classes/scriptfactory/Actions/ActionHandler.class index 1996657..f331c43 100644 Binary files a/target/classes/scriptfactory/Actions/ActionHandler.class and b/target/classes/scriptfactory/Actions/ActionHandler.class differ diff --git a/target/classes/scriptfactory/Actions/Logic/Endif.class b/target/classes/scriptfactory/Actions/Logic/Endif.class index a896c0d..7003656 100644 Binary files a/target/classes/scriptfactory/Actions/Logic/Endif.class and b/target/classes/scriptfactory/Actions/Logic/Endif.class differ diff --git a/target/classes/scriptfactory/Actions/Logic/If.class b/target/classes/scriptfactory/Actions/Logic/If.class index 8e2ac00..73f650d 100644 Binary files a/target/classes/scriptfactory/Actions/Logic/If.class and b/target/classes/scriptfactory/Actions/Logic/If.class differ diff --git a/target/classes/scriptfactory/Actions/Logic/IfNot.class b/target/classes/scriptfactory/Actions/Logic/IfNot.class index 4457877..ece8a1a 100644 Binary files a/target/classes/scriptfactory/Actions/Logic/IfNot.class and b/target/classes/scriptfactory/Actions/Logic/IfNot.class differ diff --git a/target/classes/scriptfactory/Actions/Logic/LogicHandler$1.class b/target/classes/scriptfactory/Actions/Logic/LogicHandler$1.class new file mode 100644 index 0000000..3bc838d Binary files /dev/null and b/target/classes/scriptfactory/Actions/Logic/LogicHandler$1.class differ diff --git a/target/classes/scriptfactory/Actions/Logic/LogicHandler.class b/target/classes/scriptfactory/Actions/Logic/LogicHandler.class index fc9c1bc..1b19289 100644 Binary files a/target/classes/scriptfactory/Actions/Logic/LogicHandler.class and b/target/classes/scriptfactory/Actions/Logic/LogicHandler.class differ diff --git a/target/classes/scriptfactory/Actions/SubscriptHandler.class b/target/classes/scriptfactory/Actions/SubscriptHandler.class index 5d22fac..ba6099f 100644 Binary files a/target/classes/scriptfactory/Actions/SubscriptHandler.class and b/target/classes/scriptfactory/Actions/SubscriptHandler.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$1.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$1.class new file mode 100644 index 0000000..fa9ceaf Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$1.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$2.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$2.class new file mode 100644 index 0000000..a330873 Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$2.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$3.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$3.class new file mode 100644 index 0000000..4ecfe8b Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$3.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$4.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$4.class new file mode 100644 index 0000000..521648a Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$4.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$5.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$5.class new file mode 100644 index 0000000..a7775d1 Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$5.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$6.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$6.class new file mode 100644 index 0000000..6d3e756 Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI$6.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI.class b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI.class index 918f08c..4faf5a6 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI.class and b/target/classes/scriptfactory/AdvancedGui/AdvancedOptionsGUI.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$1.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$1.class index 6b16144..ecf9e03 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$1.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$1.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$2.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$2.class new file mode 100644 index 0000000..a38303d Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$2.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$3.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$3.class new file mode 100644 index 0000000..b4b709b Binary files /dev/null and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$3.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$ScriptTreeCellRenderer.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$ScriptTreeCellRenderer.class index 17387f3..954ff26 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$ScriptTreeCellRenderer.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui$ScriptTreeCellRenderer.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.class index 93edb38..405750e 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactorySDNGui.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactoryScript.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactoryScript.class index 5c69e65..9161ef6 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactoryScript.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactoryScript.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Openlummybank.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Openlummybank.class index 15025c0..0a2282c 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Openlummybank.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Openlummybank.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Walktocows.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Walktocows.class index 068c25a..88a1032 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Walktocows.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller$Walktocows.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller.class b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller.class index 29c3f14..9736050 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller.class and b/target/classes/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller.class differ diff --git a/target/classes/scriptfactory/AdvancedGui/TipsAndTricksGUI.class b/target/classes/scriptfactory/AdvancedGui/TipsAndTricksGUI.class index ace6f6f..a83dd06 100644 Binary files a/target/classes/scriptfactory/AdvancedGui/TipsAndTricksGUI.class and b/target/classes/scriptfactory/AdvancedGui/TipsAndTricksGUI.class differ diff --git a/target/classes/scriptfactory/Consumer.class b/target/classes/scriptfactory/Consumer.class new file mode 100644 index 0000000..13c5d33 Binary files /dev/null and b/target/classes/scriptfactory/Consumer.class differ diff --git a/target/classes/scriptfactory/Core.class b/target/classes/scriptfactory/Core.class index 081b999..742f347 100644 Binary files a/target/classes/scriptfactory/Core.class and b/target/classes/scriptfactory/Core.class differ diff --git a/target/classes/scriptfactory/GUI/EnterJButton$1.class b/target/classes/scriptfactory/GUI/EnterJButton$1.class index 4c0cb1f..0916776 100644 Binary files a/target/classes/scriptfactory/GUI/EnterJButton$1.class and b/target/classes/scriptfactory/GUI/EnterJButton$1.class differ diff --git a/target/classes/scriptfactory/GUI/EnterJButton.class b/target/classes/scriptfactory/GUI/EnterJButton.class index c9bb720..b57d0a4 100644 Binary files a/target/classes/scriptfactory/GUI/EnterJButton.class and b/target/classes/scriptfactory/GUI/EnterJButton.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$1.class b/target/classes/scriptfactory/GUI/GUI$1.class new file mode 100644 index 0000000..2dd389c Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$1.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$2.class b/target/classes/scriptfactory/GUI/GUI$2.class new file mode 100644 index 0000000..e998128 Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$2.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$3.class b/target/classes/scriptfactory/GUI/GUI$3.class new file mode 100644 index 0000000..ecd582a Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$3.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$4.class b/target/classes/scriptfactory/GUI/GUI$4.class new file mode 100644 index 0000000..3750640 Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$4.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$5.class b/target/classes/scriptfactory/GUI/GUI$5.class new file mode 100644 index 0000000..ec22769 Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$5.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$6.class b/target/classes/scriptfactory/GUI/GUI$6.class new file mode 100644 index 0000000..fff25d9 Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$6.class differ diff --git a/target/classes/scriptfactory/GUI/GUI$7.class b/target/classes/scriptfactory/GUI/GUI$7.class new file mode 100644 index 0000000..6e12818 Binary files /dev/null and b/target/classes/scriptfactory/GUI/GUI$7.class differ diff --git a/target/classes/scriptfactory/GUI/GUI.class b/target/classes/scriptfactory/GUI/GUI.class index de17f2f..6a79283 100644 Binary files a/target/classes/scriptfactory/GUI/GUI.class and b/target/classes/scriptfactory/GUI/GUI.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$1.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$1.class new file mode 100644 index 0000000..14eb07d Binary files /dev/null and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$1.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$2.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$2.class new file mode 100644 index 0000000..e4342c6 Binary files /dev/null and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$2.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$3.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$3.class new file mode 100644 index 0000000..cb66c8d Binary files /dev/null and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$3.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$4.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$4.class new file mode 100644 index 0000000..4a63752 Binary files /dev/null and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$4.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$5.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$5.class new file mode 100644 index 0000000..e479575 Binary files /dev/null and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel$5.class differ diff --git a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel.class b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel.class index 366368d..17c58b6 100644 Binary files a/target/classes/scriptfactory/GUI/MainPanels/ActionPanel.class and b/target/classes/scriptfactory/GUI/MainPanels/ActionPanel.class differ diff --git a/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class b/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class index 2ce55b9..6d9ac3e 100644 Binary files a/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class and b/target/classes/scriptfactory/NewGuis/ActionGuiInfo.class differ diff --git a/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class b/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class index c8c881a..2bf99b1 100644 Binary files a/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class and b/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$1.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$1.class index 9f4cac0..3132f8e 100644 Binary files a/target/classes/scriptfactory/NewGuis/NewStatementGUI$1.class and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$1.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$2.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$2.class new file mode 100644 index 0000000..1517df9 Binary files /dev/null and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$2.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$3.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$3.class new file mode 100644 index 0000000..b504047 Binary files /dev/null and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$3.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$4.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$4.class new file mode 100644 index 0000000..e3856a2 Binary files /dev/null and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$4.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$5.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$5.class new file mode 100644 index 0000000..985cfaa Binary files /dev/null and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$5.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI$Descriptions.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI$Descriptions.class index 843588a..5e57a9f 100644 Binary files a/target/classes/scriptfactory/NewGuis/NewStatementGUI$Descriptions.class and b/target/classes/scriptfactory/NewGuis/NewStatementGUI$Descriptions.class differ diff --git a/target/classes/scriptfactory/NewGuis/NewStatementGUI.class b/target/classes/scriptfactory/NewGuis/NewStatementGUI.class index 06f025d..2c0a79b 100644 Binary files a/target/classes/scriptfactory/NewGuis/NewStatementGUI.class and b/target/classes/scriptfactory/NewGuis/NewStatementGUI.class differ diff --git a/target/classes/scriptfactory/NewGuis/UncommonActionGuiInfo.class b/target/classes/scriptfactory/NewGuis/UncommonActionGuiInfo.class index ca8afd7..62f0be4 100644 Binary files a/target/classes/scriptfactory/NewGuis/UncommonActionGuiInfo.class and b/target/classes/scriptfactory/NewGuis/UncommonActionGuiInfo.class differ diff --git a/target/classes/scriptfactory/Strategies/ActionExecutor.class b/target/classes/scriptfactory/Strategies/ActionExecutor.class index 713b308..4e53567 100644 Binary files a/target/classes/scriptfactory/Strategies/ActionExecutor.class and b/target/classes/scriptfactory/Strategies/ActionExecutor.class differ diff --git a/target/classes/scriptfactory/Strategies/RunLoop.class b/target/classes/scriptfactory/Strategies/RunLoop.class index b59d212..0f16f1d 100644 Binary files a/target/classes/scriptfactory/Strategies/RunLoop.class and b/target/classes/scriptfactory/Strategies/RunLoop.class differ diff --git a/target/classes/scriptfactory/VarsMethods.class b/target/classes/scriptfactory/VarsMethods.class index d7783c7..5bdc2c2 100644 Binary files a/target/classes/scriptfactory/VarsMethods.class and b/target/classes/scriptfactory/VarsMethods.class differ