Create maven.yml

.github/workflows/maven.yml

@@ -1,22 +1,13 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.g
 
 name: Java CI with Maven
 
 on:
   push:
-    branches:
+    branches: [ master ]
-    - master
-    - development
   pull_request:
-    branches:
+    branches: [ master ]
-    - master
-    - development
 
 jobs:
   build:
@@ -24,35 +15,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '8'
-        distribution: 'zulu'
+        distribution: 'adopt'
         cache: maven
     - name: Build with Maven
-      run: |
+      run: mvn -B package --file pom.xml
-        mvn -B package --file pom.xml
+    - name: tag-version
-        mkdir -p ~/artifacts
+      # You may pin to the exact commit or the version.
-        cp target/script-factory-1.9.jar ~/artifacts/
+      # uses: juliansangillo/tag-version@0ca10cb901a4e3273715c4443e5dec5ad8f40328
-    - name: Publish build to GH Actions
+      uses: juliansangillo/tag-version@v1.5
-      uses: actions/upload-artifact@v2
+    - name: GitHub Releases
-      with:
+      # You may pin to the exact commit or the version.
-          path: ~/artifacts/*
+      # uses: fnkr/github-action-ghr@96b1448dc6162f370067e1de51e856e733a76b4f
-          name: Build
+      uses: fnkr/github-action-ghr@v1.3
-    - name: Create Version
-      id: get_version
-      run: |
-        echo "VERSION=v$(date +%s)" >> $GITHUB_OUTPUT #&& echo "::set-output name=VERSION::${verson}"
-    - name: Upload Pre-Release
-      id: create_release
-      uses: softprops/action-gh-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
-      with:
-        tag_name: ${{ steps.get_version.outputs.VERSION }} 
-        name: ${{ github.sha }}
-        prerelease: true
-        files: |
-            target/script-factory-1.9.jar

pom.xml

@@ -12,9 +12,9 @@
 
     <repositories>
         <repository>
-            <id>2006scape-maven</id>
+            <id>parabot-maven</id>
-            <name>2006Scape's Git based repo</name>
+            <name>Parabot its Maven Repository</name>
-            <url>https://raw.github.com/2006-Scape/Maven/master</url>
+            <url>https://maven.parabot.org/</url>
         </repository>
     </repositories>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>client</artifactId>
-            <version>3.0.0</version>
+            <version>2.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.parabot</groupId>

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/ScriptFactoryScript.java

@@ -1,13 +1,8 @@
 package scriptfactory.AdvancedGui.ScriptFactorySDN;
 
+import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Cowkiller;
 import org.parabot.core.desc.ScriptDescription;
 import org.parabot.environment.scripts.Category;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat.CowkillerBones;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat.CowkillerPower;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat.FeatherFarmerBones;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Deps.Walktocows;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Thieving.ArdyCakesBanking;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Thieving.ManWomanPickpocket;
 
 public class ScriptFactoryScript extends ScriptDescription {
 
@@ -28,16 +23,9 @@ public class ScriptFactoryScript extends ScriptDescription {
 
     public static ScriptFactoryScript[] getDescriptions() {
         return new ScriptFactoryScript[]{
-                //Scripts
+                new Cowkiller(),
-                new ArdyCakesBanking(), //TODO Untested?
+                new Cowkiller.Walktocows(),
-                new CowkillerBones(),
+                new Cowkiller.Openlummybank(),
-                new CowkillerPower(),
-                new FeatherFarmerBones(),
-                new ManWomanPickpocket(),
-
-                //Deps
-                //new Openlummybank(),
-                new Walktocows(),
         };
     }
 

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/ArdyCakes.java

@@ -1,16 +1,16 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Thieving;
+package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts;
 
 import org.parabot.environment.scripts.Category;
 import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
 
-public class ArdyCakesBanking extends ScriptFactoryScript {
+public class ArdyCakes extends ScriptFactoryScript {
-    public ArdyCakesBanking() {
+    public ArdyCakes() {
         super(
                 "ArdyCakes (with banking)",
                 "Maui",
                 Category.THIEVING,
                 1.0,
-                "Steals cakes in Ardy \n Start Next To Ardy Cake Stalls",
+                "Steals cakes in Ardy",
                 "If Inventory-slots-used(28)\n" +
                         "IfNot Entity-is-around(494)\n" +
                         "Walk-to(2655,3286,35000)\n" +

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Combat/CowkillerBones.java

@@ -1,28 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat;
-
-import org.parabot.environment.scripts.Category;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class CowkillerBones extends ScriptFactoryScript {
-    public CowkillerBones() {
-        super(
-                "Cow killer (with bone burying)",
-                "Dark98",
-                Category.COMBAT,
-                1.0,
-                "Kills Cows And Buries The Bones \n Start Near Cows.",
-                "IfNot In-Combat()\n" +
-                        "If Entity-is-around(81,397,1767,1768)\n" +
-                        "Take-Ground-item(526)\n" +
-                        "Sleep(600)\n" +
-                        "If Item-is-in-Inventory(527,1)\n" +
-                        "Inventory-item-interact(527,2)\n" +
-                        "Endif\n" +
-                        "Interact-with-entity-by-ID(81,397,1767,1768,1)\n" +
-                        "Sleep(600)\n" +
-                        "Endif\n" +
-                        "Endif",
-                new String[]{}
-        );
-    }
-}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Combat/CowkillerPower.java

@@ -1,24 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat;
-
-import org.parabot.environment.scripts.Category;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class CowkillerPower extends ScriptFactoryScript {
-    public CowkillerPower() {
-        super(
-                "Power Cow killer",
-                "Dark98",
-                Category.COMBAT,
-                1.0,
-                "Kills Cows \n Start Near Cows.",
-
-                "IfNot In-Combat()\n" +
-                        "If Entity-is-around(81,397,1767,1768)\n" +
-                        "Interact-with-entity-by-ID(81,397,1767,1768,1)\n" +
-                        "Sleep(2400)\n" +
-                        "Endif\n" +
-                        "Endif",
-                new String[]{}
-        );
-    }
-}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Combat/FeatherFarmerBones.java

@@ -1,30 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Combat;
-
-import org.parabot.environment.scripts.Category;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class FeatherFarmerBones extends ScriptFactoryScript {
-    public FeatherFarmerBones() {
-        super(
-                "Feather Farmer (with bone burying)",
-                "Dark98",
-                Category.COMBAT,
-                1.0,
-                "Kills Chickens, Farms The Feathers & Buries The Bones \n Start Near Chickens",
-                "IfNot In-Combat()\n" +
-                        "If Entity-is-around(41)\n" +
-                        "If Item-is-on-Ground(526)\n" +
-                        "Take-Ground-item(526)\n" +
-                        "Take-Ground-item(314)\n" +
-                        "Endif\n" +
-                        "If Item-is-in-Inventory(527,1)\n" +
-                        "Inventory-item-interact(527,2)\n" +
-                        "Endif\n" +
-                        "Interact-with-entity-by-ID(41,1)\n" +
-                        "Sleep(600)\n" +
-                        "Endif\n" +
-                        "Endif",
-                new String[]{}
-        );
-    }
-}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Cowkiller.java

@@ -0,0 +1,81 @@
+package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts;
+
+import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
+import org.parabot.environment.scripts.Category;
+
+public class Cowkiller extends ScriptFactoryScript {
+    public Cowkiller() {
+        super(
+                "Cow killer (with banking)",
+                "Before",
+                Category.COMBAT,
+                1.0,
+                "Kills cows in lumbridge and banks in the castle",
+                "If Inventory-slots-used(28)\n" +
+                        "Run-subscript(Openlummybank)\n" +
+                        "Bank-all-except-IDs()\n" +
+                        "Run-subscript(Walktocows)\n" +
+                        "Endif\n" +
+                        "IfNot In-Combat()\n" +
+                        "If Entity-is-around(81,397,1767,1768)\n" +
+                        "Take-Ground-item(2132)\n" +
+                        "Take-Ground-item(526)\n" +
+                        "Take-Ground-item(1739)\n" +
+                        "Interact-with-entity-by-ID(81,397,1767,1768,1)\n" +
+                        "Endif\n" +
+                        "IfNot Entity-is-around(81,397,1767,1768)\n" +
+                        "Run-subscript(Walktocows)\n" +
+                        "Endif\n" +
+                        "Endif\n",
+                new String[]{"Walktocows", "Openlummybank"}
+        );
+    }
+
+    public static class Walktocows extends ScriptFactoryScript
+    {
+        public Walktocows() {
+            super(
+                    "Walktocows",
+                    "Before",
+                    "Dependency",
+                    1.0,
+                    "Walks to the cows in lumbridge from anywhere",
+                    "IfNot Entity-is-around(81,397,1767,1768)\n" +
+                            "Type(::stuck,1)\n" +
+                            "Sleep(1500)\n" +
+                            "Walk-to(3241,3226,14000)\n" +
+                            "Walk-to(3259,3233,14000)\n" +
+                            "Walk-to(3256,3250,14000)\n" +
+                            "Walk-to(3252,3266,14000)\n" +
+                            "Interact-with-entity-by-location(3253,3266,1)\n" +
+                            "Walk-to(3258,3268,5000)\n" +
+                            "Endif\n",
+                    new String[]{}
+            );
+        }
+    }
+
+    public static class Openlummybank extends ScriptFactoryScript
+    {
+        public Openlummybank() {
+            super(
+                    "Openlummybank",
+                    "Before",
+                    "Dependency",
+                    1.0,
+                    "Opens the bank in lumbridge castle from anywhere",
+                    "Type(::stuck,1)\n" +
+                            "Sleep(1500)\n" +
+                            "Interact-with-entity-by-location(3217,3218,1)\n" +
+                            "Interact-with-entity-by-location(3215,3211,1)\n" +
+                            "Interact-with-entity-by-location(3204,3207,1)\n" +
+                            "Sleep(15000)\n" +
+                            "Interact-with-entity-by-location(3204,3207,1)\n" +
+                            "Interact-with-entity-by-location(3204,3207,2)\n" +
+                            "Interact-with-entity-by-ID(494,3)\n" +
+                            "Sleep(6000)\n",
+                    new String[]{}
+            );
+        }
+    }
+}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Deps/Openlummybank.java

@@ -1,27 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Deps;
-
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class Openlummybank extends ScriptFactoryScript
-{
-    public Openlummybank() {
-        super(
-                "Openlummybank",
-                "Red Bracket",
-                "Dependency",
-                1.1,
-                "Opens the bank in lumbridge castle from anywhere",
-                "Type(::stuck,1)\n" +
-                        "Sleep(1500)\n" +
-                        "Interact-with-entity-by-location(3217,3218,1)\n" +
-                        "Interact-with-entity-by-location(3215,3211,1)\n" +
-                        "Interact-with-entity-by-location(3204,3207,1)\n" +
-                        "Sleep(15000)\n" +
-                        "Interact-with-entity-by-location(3204,3207,1)\n" +
-                        "Interact-with-entity-by-location(3204,3207,2)\n" +
-                        "Interact-with-entity-by-ID(494,3)\n" +
-                        "Sleep(6000)\n",
-                new String[]{}
-        );
-    }
-}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Deps/Walktocows.java

@@ -1,27 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Deps;
-
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class Walktocows extends ScriptFactoryScript
-{
-    public Walktocows() {
-        super(
-                "Walktocows",
-                "Red Bracket",
-                "Dependency",
-                1.0,
-                "Walks to the cows in lumbridge from anywhere",
-                "IfNot Entity-is-around(81,397,1767,1768)\n" +
-                        "Type(::stuck,1)\n" +
-                        "Sleep(1500)\n" +
-                        "Walk-to(3241,3226,14000)\n" +
-                        "Walk-to(3259,3233,14000)\n" +
-                        "Walk-to(3256,3250,14000)\n" +
-                        "Walk-to(3252,3266,14000)\n" +
-                        "Interact-with-entity-by-location(3253,3266,1)\n" +
-                        "Walk-to(3258,3268,5000)\n" +
-                        "Endif\n",
-                new String[]{}
-        );
-    }
-}

src/main/java/scriptfactory/AdvancedGui/ScriptFactorySDN/Scripts/Thieving/ManWomanPickpocket.java

@@ -1,20 +0,0 @@
-package scriptfactory.AdvancedGui.ScriptFactorySDN.Scripts.Thieving;
-
-import org.parabot.environment.scripts.Category;
-import scriptfactory.AdvancedGui.ScriptFactorySDN.ScriptFactoryScript;
-
-public class ManWomanPickpocket extends ScriptFactoryScript {
-    public ManWomanPickpocket() {
-        super(
-                "Pickpocket (Man/Woman)",
-                "Dark98",
-                Category.THIEVING,
-                1.0,
-                "Pickpockets Men/Women \n Start Near Man/Woman",
-                "If Entity-is-around(1,2,3,4,5,6)\n" +
-                        "Interact-with-entity-by-ID(1,2,3,4,5,6,3)\n" +
-                        "Endif",
-                new String[]{}
-        );
-    }
-}