From 0af432fd4d01fce1c80e9f35d8e5c5999c4abee7 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 21:11:12 +0200 Subject: [PATCH 01/10] Create README.md --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..fe5ec2c --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +![icon](screenshots/screenshot_icon.png) + +# HyBlockUtils: An Android App for Hypixel SkyBlock +An Android app containing a collection of useful tools for Hypixel SkyBlock + +![icon](screenshots/screenshot_app_pages.png) + +## Pages +- **Main Menu** +- **Profile Viewer** - personal and search +- **Calender** - showing upcoming events in the next 48 hours in two columns +- **Notifications** - for next Dark Auction and other important events like Spooky Festival, etc. +- **Bazaar** - list of all items and prices sorted by category name +- **AH Price Lookup** - search through all ah items names and lore using space seperated keywords; double quotes for grouping +- **Settings** - API key, personal user name and an option to limit the ah page requests to 10 instead of the full 70 + +## First Steps +1. **API Key** - look up your hypixel api key or enter `/api` in-game to create a new one +2. **API Settings** - go to the gear icon in the top right corner and enter your API key +3. **User Name Setting** - go to the gear icon in the top right corner and enter your or any other user name (for the quick access) +4. Done From c363a46321142e8c64d2b7124c2113771c15fca2 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 21:35:34 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fe5ec2c..2fdd2b8 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,7 @@ An Android app containing a collection of useful tools for Hypixel SkyBlock 2. **API Settings** - go to the gear icon in the top right corner and enter your API key 3. **User Name Setting** - go to the gear icon in the top right corner and enter your or any other user name (for the quick access) 4. Done + +## Requirements +- Most versions of Android (API level 16 and higher) + - tested with API level 16-emulated (Jelly Bean 4.1), 17-emulated (Jelly Bean 4.2), 22-emulated (Lollipop 5.1), 23-physical (Marshmallow 6.0), 25-emulated (Nougat 7.1) and 30-physical (Android 11) From c06abeb5ae28622d28da6dae90805f2b298e9994 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 21:47:23 +0200 Subject: [PATCH 03/10] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2fdd2b8..35e5492 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,6 @@ An Android app containing a collection of useful tools for Hypixel SkyBlock ## Requirements - Most versions of Android (API level 16 and higher) - tested with API level 16-emulated (Jelly Bean 4.1), 17-emulated (Jelly Bean 4.2), 22-emulated (Lollipop 5.1), 23-physical (Marshmallow 6.0), 25-emulated (Nougat 7.1) and 30-physical (Android 11) + +## Credits +TheNullicorn - for this amazing NBT parsing lib https://github.com/TheNullicorn/Nedit From f33f6e16aef243911e19c8a174289d6d9c35e5fc Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 22:05:57 +0200 Subject: [PATCH 04/10] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e161a98 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021-present doej1367 and other contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From af6b4b18868c67f335ee076436509edc059e8e2f Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 22:33:32 +0200 Subject: [PATCH 05/10] Update README.md fixed a typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 35e5492..3b4a3d9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ An Android app containing a collection of useful tools for Hypixel SkyBlock - **Calender** - showing upcoming events in the next 48 hours in two columns - **Notifications** - for next Dark Auction and other important events like Spooky Festival, etc. - **Bazaar** - list of all items and prices sorted by category name -- **AH Price Lookup** - search through all ah items names and lore using space seperated keywords; double quotes for grouping +- **AH Price Lookup** - search through all ah items names and lore using space separated keywords; double quotes for grouping - **Settings** - API key, personal user name and an option to limit the ah page requests to 10 instead of the full 70 ## First Steps From 65bf749089fb0b113b0acad3e3f18cce343bdfef Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 22:54:05 +0200 Subject: [PATCH 06/10] Create CONTRIBUTING.md --- CONTRIBUTING.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..8c0004f --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,21 @@ +# Contributing to HyBlockUtils + +## Required Hardware and Software +- [Android Studio](https://developer.android.com/studio) +- Multible Android Devices or Emulators on different API Levels (API level 16 or higher) for testing + - can be created in Android Studion using the included AVD Manager +- A [Hypixel API key](https://api.hypixel.net/#section/Authentication/ApiKey) for testing + +## Getting Started +1. Log into github +2. Fork this repository +3. Clone the project to your local machine + - git command, Android Studio or some GUI (I for example used SourceTree) +4. Import the projekt into Android Studio +5. (Wait for the project to fully load) +6. Select an Android device (physical or emulated) with an api level of 16 or higher + - create an emulated one with the AVD manager if you don't have one +7. Now you can change files and test the app (don't forget to enter the api key in the settings of the app) +8. Once you are you are happy with your result you can comit and push everything to your forked project +9. If you want to create a pull request you can do that on the github page of your forked project + - github automatically offers you that option once you've made changes to your forked project From 097c32f79f99b8fa7bd65ad203b25732fc9f6696 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 22:58:27 +0200 Subject: [PATCH 07/10] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c0004f..16860b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,6 @@ 6. Select an Android device (physical or emulated) with an api level of 16 or higher - create an emulated one with the AVD manager if you don't have one 7. Now you can change files and test the app (don't forget to enter the api key in the settings of the app) -8. Once you are you are happy with your result you can comit and push everything to your forked project +8. Once you are you are happy with your result you can comit and push everything to an new branch of your forked project 9. If you want to create a pull request you can do that on the github page of your forked project - github automatically offers you that option once you've made changes to your forked project From dc79fa212b42d18fdec423f1384352b02b14d1ac Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 23:00:58 +0200 Subject: [PATCH 08/10] Update CONTRIBUTING.md typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 16860b4..f573cb0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,6 @@ 6. Select an Android device (physical or emulated) with an api level of 16 or higher - create an emulated one with the AVD manager if you don't have one 7. Now you can change files and test the app (don't forget to enter the api key in the settings of the app) -8. Once you are you are happy with your result you can comit and push everything to an new branch of your forked project +8. Once you are you are happy with your result you can comit and push everything to a new branch of your forked project 9. If you want to create a pull request you can do that on the github page of your forked project - github automatically offers you that option once you've made changes to your forked project From 3017cb83052c28607e6841928ad72511fe1759ff Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 23:08:28 +0200 Subject: [PATCH 09/10] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..44aeb5c --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,71 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '27 1 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 From 86613621038e563a0f585b4432d006beb7c87299 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 17 Sep 2021 23:28:24 +0200 Subject: [PATCH 10/10] Delete .github/workflows directory --- .github/workflows/codeql-analysis.yml | 71 --------------------------- 1 file changed, 71 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 44aeb5c..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,71 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '27 1 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1