diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d2293a4e33..ef5ef3dfe1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,16 +1,2 @@ -# Modifications to the source code should be handled by the code review team -*.java @Slimefun/code-reviewers - -# Modifications to sensitive files should be reviewed by maintainers -/.github/ @Slimefun/slimefun4-maintainers -pom.xml @Slimefun/slimefun4-maintainers -CONTRIBUTING.md @Slimefun/slimefun4-maintainers - -# Changes to the Issue templates need to be checked by the triage team -/.github/ISSUE_TEMPLATE/ @Slimefun/bug-testers - -# Our wiki lookup file will be reviewed by the wiki staff team -/src/main/resources/wiki.json @Slimefun/wiki-staff - -# This file is handled by TheBusyBiscuit (admins have overwrite access anyway) -/.github/CODEOWNERS @TheBusyBiscuit +# All changes are reviewed by the maintainers +* @Slimefun5/maintainers diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index 0a2e285211..a6e04fc4ac 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -1,4 +1,4 @@ -# Slimefun4 - Code of Conduct +# Slimefun5 - Code of Conduct ### What is a Code of Conduct? > A code of conduct is a document that establishes expectations for behavior for your project’s participants. > Adopting, and enforcing, a code of conduct can help create a positive social atmosphere for your community. @@ -7,8 +7,7 @@ This document should serve the purpose of outlining the behaviour we expect from any participant of the project. ## :mag_right: Scope -This Code of Conduct applies to all sections of the [Slimefun4 GitHub repository](https://github.com/Slimefun/Slimefun4), our [Slimefun GitHub organization](https://github.com/Slimefun) and all repositories owned by said organization.
-For our official Discord server, please refer to our article on [Discord Rules](https://github.com/Slimefun/Slimefun4/wiki/Discord-Rules). +This Code of Conduct applies to all sections of the [Slimefun5 GitHub repository](https://github.com/Slimefun5/Slimefun5) and our [Slimefun5 GitHub organization](https://github.com/Slimefun5). Everyone who engages with this project on any of these repositories is expected to follow the Code of Conduct.
This includes maintainers, contributors, sponsors and anyone who engages in the "Issues" section on GitHub. @@ -18,8 +17,7 @@ This is an Open-Source project, anyone is welcome to engage and contribute!
We generally expect users to engage in the Issues section by reporting bugs or commenting on bug reports to give additional context, help, guidance or to propose possible solutions and fixes. Pull Requests are very much welcome and encouraged! They keep the project alive, so if you see an Issue and know how to fix it, feel free to create a Pull Request! -Issues that are considered "good first issues", indicated by the [good first issue](https://github.com/Slimefun/Slimefun4/labels/good%20first%20issue) label, are generally expected to be beginner-friendly. -And even if you shouldn't know where to start or how to proceed, our [Discord Server](https://discord.gg/slimefun) and its community will be there for you! +Issues that are considered "good first issues", indicated by the [good first issue](https://github.com/Slimefun5/Slimefun5/labels/good%20first%20issue) label, are generally expected to be beginner-friendly. When commenting, please keep in mind that this software is offered for **free**. Don't expect to receive lightning-fast replies 24 hours a day. Everyone here works on this project in their free time and usually has work, school, university or family to take care of, so we appreciate patience and understanding. @@ -54,13 +52,12 @@ comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate. -You can see a list of people who are recognized as "project maintainers" for Slimefun on the Slimefun GitHub organization:
-https://github.com/orgs/Slimefun/people +You can see a list of people who are recognized as "project maintainers" for Slimefun on the Slimefun5 GitHub organization:
+https://github.com/orgs/Slimefun5/people ## :wrench: Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders (labelled on Discord as "Admins" or "Moderators") responsible for enforcement on our [Discord Server](discord.gg/slimefun). -If you want your issue to be handled discreetly, message `TheBusyBiscuit#2610` or `Walshy#9709` privately on Discord and state your concerns. +reported to the project maintainers via [GitHub Issues](https://github.com/Slimefun5/Slimefun5/issues). All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 08c508502f..96c9f3ba09 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ THIS ISSUE IS INVALID. -TO REPORT A BUG, GO HERE -> https://github.com/Slimefun/Slimefun4/issues/new/choose +TO REPORT A BUG, GO HERE -> https://github.com/Slimefun5/Slimefun5/issues/new/choose diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml index fcc3435e70..3e14809431 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/bug-report.yaml @@ -1,28 +1,25 @@ name: Bug Report -description: Report a Bug or an Issue with Slimefun 4. +description: Report a Bug or an Issue with Slimefun. labels: ['🎯 Needs testing', '🐞 Bug Report'] body: - type: markdown attributes: value: | - ## 👋 Welcome to the Slimefun Bug Tracker - If you need any help to identify the problem, visit our [Discord server](https://discord.gg/slimefun) and see if others experience a similar issue. - Also take a look at our [Troubleshooting Guide](https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs) and the list of [existing Issues](https://github.com/Slimefun/Slimefun4/issues). + ## Bug Tracker + Take a look at our [Troubleshooting Guide](https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs) and the list of [existing Issues](https://github.com/Slimefun5/Slimefun5/issues).
Fields marked with an asterisk (*) are required.
- id: checklist type: checkboxes attributes: - label: '❗ Checklist' + label: 'Checklist' description: Please go through this checklist before creating the issue. options: - label: I am using the official english version of Slimefun and did not modify the jar. required: true - - label: I downloaded the official version from the new build site [Blob Builds](https://blob.build/). - required: true - - label: I am using an up to date "DEV" (not "RC") version of Slimefun. + - label: I downloaded the latest release from [GitHub Releases](https://github.com/Slimefun5/Slimefun5/releases). required: true - label: I am aware that issues related to Slimefun addons need to be reported on their bug trackers and not here. required: true @@ -34,7 +31,7 @@ body: validations: required: true attributes: - label: '📍 Description' + label: 'Description' description: | A clear and detailed description of what went wrong. The more information you can provide, the easier we can handle this problem. @@ -46,7 +43,7 @@ body: validations: required: true attributes: - label: '📑 Reproduction Steps' + label: 'Reproduction Steps' description: | Tell us the exact steps to reproduce this issue, the more detailed the easier we can reproduce it. placeholder: | @@ -59,7 +56,7 @@ body: validations: required: true attributes: - label: '💡 Expected Behavior' + label: 'Expected Behavior' description: | What were you expecting to happen? What do you think would have been the correct behaviour? @@ -69,7 +66,7 @@ body: - id: media type: textarea attributes: - label: '📷 Screenshots / Videos' + label: 'Screenshots / Videos' description: | The best way to illustrate in an issue is by recording a Video or taking a Screenshot. If you can capture any footage of the bug happening, it would help us out a lot! @@ -79,7 +76,7 @@ body: - id: server-log type: input attributes: - label: '📜 Server Log' + label: 'Server Log' description: | Take a look at your Server Log and upload any error messages from Slimefun to a pasting site (e.g. https://pastebin.com/). If you are unsure about it, post your full log, you can find it under /logs/latest.log @@ -88,7 +85,7 @@ body: - id: error-reports type: input attributes: - label: '📂 `/error-reports/` folder' + label: '`/error-reports/` folder' description: | Check the folder `/plugins/Slimefun/error-reports/` and upload any files inside that folder to a pasting site (e.g. https://pastebin.com/). placeholder: https://pastebin.com/... @@ -98,13 +95,12 @@ body: validations: required: true attributes: - label: '💻 Server Software' + label: 'Server Software' description: 'Please select the software your Server is running on' options: - Spigot - Paper - Purpur - - Airplane - Other (please specify in your description) - id: minecraft-version @@ -112,9 +108,10 @@ body: validations: required: true attributes: - label: '🎮 Minecraft Version' + label: 'Minecraft Version' description: 'Please select the Minecraft version of the server' options: + - 1.21.x - 1.20.x - 1.19.x - 1.18.x @@ -127,7 +124,7 @@ body: validations: required: true attributes: - label: '⭐ Slimefun version' + label: 'Slimefun version' description: | **"latest" is not a version number, we need the exact version.** We recommend running "/sf versions" and uploading a screenshot of that. @@ -137,7 +134,7 @@ body: - id: other-versions type: textarea attributes: - label: '🧭 Other plugins' + label: 'Other plugins' description: | If your issue is related to another plugin, make sure to include this here! placeholder: The issue is related to plugin [...], version [...] @@ -145,8 +142,6 @@ body: - type: markdown attributes: value: | - ## ❤️ Thank you for submitting your bug report! + ## Thank you for submitting your bug report! If you find any additional info that can help to identify this problem, don't hesitate to comment on your issue! Any additional info can help us fix this bug faster. - In the meantime, try visiting our [Discord server](https://discord.gg/slimefun). - Perhaps someone else has experienced a similar issue. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b14ef722f3..4a69e7cfd6 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,8 @@ blank_issues_enabled: false contact_links: - name: Code of Conduct - url: https://github.com/Slimefun/Slimefun4/blob/master/.github/CODE_OF_CONDUCT.md + url: https://github.com/Slimefun5/Slimefun5/blob/stable/.github/CODE_OF_CONDUCT.md about: Please read this before posting - name: Bug Report Guidelines url: https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs about: Guidelines on how to make good Bug reports - - name: Discord Server (for Questions and Suggestions) - url: https://discord.gg/slimefun - about: Please ask and answer questions here. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0ebdee6426..7b2f4c2386 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,7 +17,7 @@ - [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos. - [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them. -- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*). +- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.21.*). - [ ] I followed the existing code standards and didn't mess up the formatting. - [ ] I did my best to add documentation to any public classes or methods I added. - [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values diff --git a/.github/docs-config.yml b/.github/docs-config.yml new file mode 100644 index 0000000000..3ab82861ba --- /dev/null +++ b/.github/docs-config.yml @@ -0,0 +1,4 @@ +description: "Slimefun is a Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server." +java: "25" +paper: "1.16.* - 26.1.*" +gradle_plugin: "1.8.2.1" diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml deleted file mode 100644 index 8f3836fad9..0000000000 --- a/.github/workflows/auto-approve.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Auto approve - -on: pull_request - -permissions: - contents: read - -jobs: - auto-approve: - - name: Auto approve Pull Request - runs-on: ubuntu-latest - - # for hmarr/auto-approve-action to approve PRs - permissions: - pull-requests: write - - # Only run this on the main repo - if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4' - - steps: - - name: Approve via actions - uses: hmarr/auto-approve-action@v4.0.0 - if: github.actor == 'TheBusyBot' || github.actor == 'renovate[bot]' - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/auto-squash.yml b/.github/workflows/auto-squash.yml deleted file mode 100644 index 8b8ef1f434..0000000000 --- a/.github/workflows/auto-squash.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Auto squash pull requests - -on: - pull_request_review: - types: - - submitted - - check_suite: - types: - - completed - - status: {} - -jobs: - autosquash-crowdin: - - name: Auto squash (Crowdin) - runs-on: ubuntu-latest - - ## Only run this on the main repo - if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4' - - steps: - - name: Auto squash - uses: pascalgn/automerge-action@v0.16.4 - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} - UPDATE_RETRIES: 0 - MERGE_METHOD: squash - MERGE_FORKS: false - MERGE_DELETE_BRANCH: true - MERGE_LABELS: '📄 Translations Update' - MERGE_COMMIT_MESSAGE: '[CI skip] New locale updates from Crowdin' - - autosquash-renovate: - - name: Auto squash (Renovate) - runs-on: ubuntu-latest - - ## Only run this on the main repo - if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4' - - steps: - - name: Auto squash - uses: pascalgn/automerge-action@v0.16.4 - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} - UPDATE_RETRIES: 0 - MERGE_METHOD: squash - MERGE_FORKS: false - MERGE_DELETE_BRANCH: true - MERGE_LABELS: '🚨 Dependency Update' - MERGE_COMMIT_MESSAGE: '[CI skip] ${{ github.event.pull_request.title }}' diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000000..1c069d3a70 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,7 @@ +name: CI + +on: [push, pull_request] + +jobs: + build: + uses: Slimefun5/workflows/.github/workflows/ci.yaml@stable diff --git a/.github/workflows/close-invalid-issues.yml b/.github/workflows/close-invalid-issues.yml deleted file mode 100644 index 705f6ab9a5..0000000000 --- a/.github/workflows/close-invalid-issues.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Close invalid Issue - -on: - issues: - types: [opened] - -jobs: - comment: - - name: Invalid Issues - runs-on: ubuntu-latest - - if: contains(github.event.issue.labels.*.name, '🐞 Bug Report') == false && contains(github.event.issue.labels.*.name, 'Hacktoberfest') == false - steps: - - name: Close Issue - uses: maxkomarychev/octions/octions/issues/update@master - with: - token: ${{ secrets.ACCESS_TOKEN }} - issue_number: ${{ github.event.issue.number }} - state: closed - - name: Add invalid label - uses: maxkomarychev/octions/octions/issues/add-labels@master - with: - token: ${{ secrets.ACCESS_TOKEN }} - issue_number: ${{ github.event.issue.number }} - labels: 'invalid' - - name: Create a comment - uses: maxkomarychev/octions/octions/issues/create-comment@master - with: - token: ${{ secrets.ACCESS_TOKEN }} - issue_number: ${{ github.event.issue.number }} - body: |- - Your issue seems to be missing our template. - [Click here to create a bug report](https://github.com/Slimefun/Slimefun4/issues/new/choose) - - Please remember that this Bug Tracker is exclusively reserved for Bug reports, any other form - of discussion, like suggestions or questions should be posted on our discord server (You can find a link [on our main page](https://github.com/Slimefun/Slimefun4#discord)). diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml deleted file mode 100644 index 6735d5d642..0000000000 --- a/.github/workflows/discord-webhook.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Discord Webhook - -on: - push: - paths: - - 'src/**' - - '!src/main/resources/languages/**' - - 'pom.xml' - -permissions: - contents: read - -jobs: - report: - - name: Discord Webhook - runs-on: ubuntu-latest - - ## Only run this on the main repo - if: github.repository == 'Slimefun/Slimefun4' - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - - - name: Set up Java JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Run Discord Webhook - uses: baked-libs/discord-webhook@1.5.1 - with: - id: ${{ secrets.DISCORD_WEBHOOK_ID }} - token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }} diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml deleted file mode 100644 index 7cb94d0dcb..0000000000 --- a/.github/workflows/duplicates.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Mark Issue as duplicate - -on: - issue_comment: - types: [created] - -permissions: - contents: read - issues: write - -jobs: - comment: - - name: Mark Issue as duplicate - runs-on: ubuntu-latest - - if: contains(github.event.comment.body, 'Duplicate of ') - - steps: - - name: Add label to the Issue - uses: maxkomarychev/octions/octions/issues/add-labels@master - with: - token: ${{ secrets.ACCESS_TOKEN }} - issue_number: ${{ github.event.issue.number }} - labels: '🚩 Duplicate' diff --git a/.github/workflows/e2e-testing.yml b/.github/workflows/e2e-testing.yml deleted file mode 100644 index e6be9ca39a..0000000000 --- a/.github/workflows/e2e-testing.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: End to End Testing - -on: - workflow_call: - inputs: - artifact-name: - description: 'Slimefun artifact name' - required: true - type: string - -jobs: - e2e-testing: - name: End to End Testing - runs-on: ubuntu-latest - timeout-minutes: 5 - - strategy: - matrix: - include: - - mcVersion: '1.16.5' - javaVersion: '16' - - mcVersion: '1.17.1' - javaVersion: '17' - - mcVersion: '1.18.2' - javaVersion: '18' - - mcVersion: '1.19.4' - javaVersion: '19' - - mcVersion: '1.20.4' - javaVersion: '20' - - mcVersion: '1.20.6' - javaVersion: '21' - #- mcVersion: 'latest' - # javaVersion: '21' - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK - uses: actions/setup-java@v4.6.0 - with: - distribution: temurin - java-version: ${{ matrix.javaVersion }} - java-package: jdk - architecture: x64 - - - name: Setup server - run: | - echo 'eula=true' > eula.txt - mkdir plugins - - - name: Download ${{ matrix.mcVersion }} Paper - run: | - VERSION="${{ matrix.mcVersion }}" - if [ "$VERSION" == "latest" ]; then - VERSION=$(curl https://api.papermc.io/v2/projects/paper/ -s | jq -r '.versions[-1]') - fi - - BUILD_JAR=$(curl -s "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds" \ - | jq '.builds[-1] | "\(.build) \(.downloads.application.name)"' -r) - BUILD=$(echo "$BUILD_JAR" | awk '{print $1}') - JAR_FILE=$(echo "$BUILD_JAR" | awk '{print $2}') - - echo "Downloading... https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE" - curl -o paper.jar \ - "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE" - - - name: Download Slimefun - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.artifact-name }} - path: plugins/ - - - name: Download e2e-tester - run: | - curl -o e2e-tester.jar https://preview-builds.walshy.dev/download/e2e-tester/main/latest - mv e2e-tester.jar plugins/e2e-tester.jar - - - name: Run server - run: | - java -jar paper.jar --nogui diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml deleted file mode 100644 index f628c2a692..0000000000 --- a/.github/workflows/javadocs.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Javadocs - -on: - push: - paths: - - 'src/**' - - 'pom.xml' - -permissions: - contents: read - -jobs: - build: - name: Maven build - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Build Javadocs - run: mvn javadoc:javadoc diff --git a/.github/workflows/json-validator.yml b/.github/workflows/json-validator.yml deleted file mode 100644 index 512a484828..0000000000 --- a/.github/workflows/json-validator.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Validate JSON - -on: - push: - paths: - - 'src/main/resources/wiki.json' - pull_request: - paths: - - 'src/main/resources/wiki.json' - -permissions: - contents: read - -jobs: - validate: - - name: Validate JSON - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Validate wiki.json - uses: docker://orrosenblatt/validate-json-action:latest@sha256:02370758b8b199e0477da11ecfdd498c75c561685056b5c31b925a4ab95df7f4 - env: - INPUT_SCHEMA: '.github/configs/wiki-schema.json' - INPUT_JSONS: 'src/main/resources/wiki.json' diff --git a/.github/workflows/label-resolved-issues.yml b/.github/workflows/label-resolved-issues.yml deleted file mode 100644 index 5a54fb3144..0000000000 --- a/.github/workflows/label-resolved-issues.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Label resolved issues - -on: - issues: - types: [closed] - -permissions: - contents: read - issues: write - -jobs: - label: - - name: Label Issue - runs-on: ubuntu-latest - if: contains(github.event.issue.labels.*.name, '🐞 Bug Report') - - steps: - - name: Query recent commits - uses: TheBusyBiscuit/recently-closed-issues@1.1.0 - id: resolved - with: - token: ${{ secrets.ACCESS_TOKEN }} - max_commits: 20 - - - name: Add label - if: contains(steps.resolved.outputs.issues, github.event.issue.number) - uses: maxkomarychev/octions/octions/issues/add-labels@master - with: - token: ${{ secrets.ACCESS_TOKEN }} - issue_number: ${{ github.event.issue.number }} - labels: '✔ Resolved' diff --git a/.github/workflows/maven-compiler.yml b/.github/workflows/maven-compiler.yml deleted file mode 100644 index fa79dc66ca..0000000000 --- a/.github/workflows/maven-compiler.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Java CI - -on: - push: - branches: - - master - paths: - - 'src/**' - - 'pom.xml' - pull_request: - paths: - - '.github/workflows/**' - - 'src/**' - - 'pom.xml' - - 'CHANGELOG.md' - -permissions: - contents: read - -jobs: - build: - - name: Maven build - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Build with Maven - run: mvn package --file pom.xml diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml deleted file mode 100644 index 5ac09a0a50..0000000000 --- a/.github/workflows/merge-conflicts.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Merge Conflicts - -on: - push: - branches: - - master - -permissions: - contents: read - pull-requests: write - -jobs: - validate: - if: github.repository == 'Slimefun/Slimefun4' - name: Check for merge conflicts - runs-on: ubuntu-latest - - steps: - - uses: mschilde/auto-label-merge-conflicts@master - with: - CONFLICT_LABEL_NAME: '⚡ Merge Conflicts' - GITHUB_TOKEN: "${{ secrets.ACCESS_TOKEN }}" diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml deleted file mode 100644 index b857b2faa6..0000000000 --- a/.github/workflows/pr-labels.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Pull Request Labels - -on: - pull_request_target: - types: - - opened - -permissions: - contents: read - pull-requests: write - -jobs: - pr-labeler: - - name: Pull Request Labels - runs-on: ubuntu-latest - if: github.repository == 'Slimefun/Slimefun4' - - steps: - - uses: baked-libs/pull-request-labels@v1.1 - id: labeller - name: Apply labels based on branch - with: - token: "${{ secrets.GITHUB_TOKEN }}" - renovate: '🚨 Dependency Update' - crowdin: '📄 Translations Update' - feature: '🎈 Feature' - fix: '✨ Fix' - chore: '🧹 Chores' - performance: '💡 Performance Optimization' - api: '🔧 API' - compatibility: '🤝 Compatibility' - - - uses: thollander/actions-comment-pull-request@v2.5.0 - name: Leave a comment about the applied label - if: ${{ steps.labeller.outputs.applied != 0 }} - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - message: | - Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}" - Thank you for contributing to this project! ❤️ - - - uses: thollander/actions-comment-pull-request@v2.5.0 - name: Leave a comment about our branch naming convention - if: ${{ steps.labeller.outputs.applied == 0 }} - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - message: | - **Pro Tip!** - You can help us label your Pull Requests by using the following branch naming convention next time you create a pull request. ❤️ - Branch naming convention | Label - ------------------------ | ------ - `feature/**` | 🎈 Feature - `fix/**` | ✨ Fix - `chore/**` | 🧹 Chores - `api/**` | 🔧 API - `performance/**` | 💡 Performance Optimization - `compatibility/**` | 🤝 Compatibility -
- If your changes do not fall into any of these categories, don't worry. - You can just ignore this message in that case! 👀 diff --git a/.github/workflows/preview-builds.yml b/.github/workflows/preview-builds.yml deleted file mode 100644 index b9e7b5d26a..0000000000 --- a/.github/workflows/preview-builds.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Preview builds - -on: - workflow_run: - workflows: ["Pull Request"] - types: - - completed - -permissions: - contents: read - pull-requests: write - -jobs: - preview: - if: ${{ github.repository_owner == 'Slimefun' && github.event.workflow_run.conclusion == 'success' }} - name: Build and Publish the jar - runs-on: ubuntu-latest - - steps: - # Kinda jank way to grab the PR and commit hash and then download the artifact - # TODO: Move this code to our own mini-action - - name: Grab PR & run ID and download the artifact - uses: actions/github-script@v7 - with: - script: | - const allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: context.payload.workflow_run.id, - }); - - for (const artifact of allArtifacts.data.artifacts) { - // Extract the PR number and commit hash from the artifact name - const match = /^slimefun-(\d+)-([a-f0-9]{8})$/.exec(artifact.name); - if (match) { - require("fs").appendFileSync( - process.env.GITHUB_ENV, - `\nPR_NUMBER=${match[1]}` + - `\nCOMMIT_HASH=${match[2]}` - ); - - const download = await github.rest.actions.downloadArtifact({ - owner: context.repo.owner, - repo: context.repo.repo, - artifact_id: artifact.id, - archive_format: 'zip', - }); - require('fs').writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview.zip`, Buffer.from(download.data)) - - break; - } - } - - # Unzip the artifact - - name: Unzip - run: | - unzip preview.zip - rm preview.zip - mv 'Slimefun vPreview Build #${{ env.PR_NUMBER }}-${{ env.COMMIT_HASH }}.jar' preview.jar - - - name: Upload to preview service - run: | - curl -X POST \ - -H 'Authorization: ${{ secrets.PUBLISH_TOKEN }}' \ - -H "X-Checksum: $(sha256sum 'preview.jar' | awk '{print $1}')" \ - --data-binary '@preview.jar' \ - https://preview-builds.walshy.dev/upload/Slimefun/${{ env.PR_NUMBER }}/${{ env.COMMIT_HASH }} - - - name: Post comment - uses: marocchino/sticky-pull-request-comment@v2 - with: - number: ${{ env.PR_NUMBER }} - message: | - ### Slimefun preview build - - A Slimefun preview build is available for testing! - Commit: ${{ env.COMMIT_HASH }} - - https://preview-builds.walshy.dev/download/Slimefun/${{ env.PR_NUMBER }}/${{ env.COMMIT_HASH }} - - > **Note**: This is not a supported build and is only here for the purposes of testing. - > Do not run this on a live server and do not report bugs anywhere but this PR! diff --git a/.github/workflows/publish-build.yml b/.github/workflows/publish-build.yml deleted file mode 100644 index 31e94e16a2..0000000000 --- a/.github/workflows/publish-build.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Publish build - -on: - push: - branches: - - master - - stable - - experimental - -jobs: - publish: - name: Upload build - runs-on: ubuntu-latest - if: contains(github.event.head_commit.message, '[ci skip]') == false - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Build with Maven - run: mvn clean package - - - name: Upload Dev build - uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd - if: github.ref == 'refs/heads/master' - with: - project: Slimefun4 - releaseChannel: Dev - apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }} - file: './target/Slimefun v4.9-UNOFFICIAL.jar' - releaseNotes: ${{ github.event.head_commit.message }} - - - name: Upload RC build - uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd - if: github.ref == 'refs/heads/stable' - with: - project: Slimefun4 - releaseChannel: 'RC' - apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }} - file: './target/Slimefun v4.9-UNOFFICIAL.jar' - releaseNotes: ${{ github.event.head_commit.message }} - - - name: Upload Experimental build - uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd - if: github.ref == 'refs/heads/experimental' - with: - project: Slimefun4 - releaseChannel: 'Experimental' - apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }} - file: './target/Slimefun v4.9-UNOFFICIAL.jar' - releaseNotes: ${{ github.event.head_commit.message }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml deleted file mode 100644 index 28e0d47a98..0000000000 --- a/.github/workflows/pull-request.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Pull Request - -on: - pull_request: - paths: - - '.github/workflows/**' - - 'src/**' - - 'pom.xml' - -permissions: - contents: read - -jobs: - setup-preview-build: - name: Preview build - runs-on: ubuntu-latest - outputs: - short-commit-hash: ${{ steps.env-setup.outputs.SHORT_COMMIT_HASH }} - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - # Setup for the preview build - - id: env-setup - run: | - SHORT_COMMIT_HASH=$(git rev-parse --short=8 ${{ github.sha }}) - JAR_VERSION="Preview Build #${{ github.event.number }}-$SHORT_COMMIT_HASH" - echo "SHORT_COMMIT_HASH=$SHORT_COMMIT_HASH" >> "$GITHUB_ENV" - echo "SHORT_COMMIT_HASH=$SHORT_COMMIT_HASH" >> "$GITHUB_OUTPUT" - echo "JAR_VERSION=$JAR_VERSION" >> "$GITHUB_ENV" - sed -i "s/4.9-UNOFFICIAL<\/version>/$JAR_VERSION<\/version>/g" pom.xml - - - name: Build with Maven - run: mvn package - - - name: Upload the artifact - uses: actions/upload-artifact@v4 - with: - name: slimefun-${{ github.event.number }}-${{ env.SHORT_COMMIT_HASH }} - path: 'target/Slimefun v${{ env.JAR_VERSION }}.jar' - - call-workflows: - needs: [setup-preview-build] - uses: ./.github/workflows/e2e-testing.yml - with: - artifact-name: slimefun-${{ github.event.number }}-${{ needs.setup-preview-build.outputs.short-commit-hash }} diff --git a/.github/workflows/readme.yaml b/.github/workflows/readme.yaml new file mode 100644 index 0000000000..e8605d5eb2 --- /dev/null +++ b/.github/workflows/readme.yaml @@ -0,0 +1,15 @@ +name: Generate README + +on: + workflow_dispatch: + push: + branches: + - experimental + +jobs: + readme: + permissions: + contents: write + uses: Slimefun5/workflows/.github/workflows/readme-addon.yaml@stable + with: + repository: ${{ github.repository }} diff --git a/.github/workflows/release-candidates.yml b/.github/workflows/release-candidates.yml deleted file mode 100644 index e330af4b09..0000000000 --- a/.github/workflows/release-candidates.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: Create new Release Candidate - -on: - workflow_dispatch: - inputs: - number: - description: 'RC number (e.g. 15)' - required: true - release_date: - description: 'Date of release (e.g. 12-apr-2021)' - required: true - -jobs: - release: - - name: Create new release - runs-on: ubuntu-latest - - steps: - - - name: Checkout repository - uses: actions/checkout@v4 - with: - ref: 'stable' - - - name: Merge latest commits into 'stable' - uses: devmasx/merge-branch@1.4.0 - with: - type: now - from_branch: 'master' - target_branch: 'stable' - github_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Get the latest commit sha - id: latest - run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - - name: Create Release - id: create_release - uses: actions/create-release@v1.1.4 - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} - with: - tag_name: RC-${{ github.event.inputs.number }} - release_name: Release Candidate ${{ github.event.inputs.number }} (git ${{ steps.latest.outputs.sha_short }}) - draft: false - prerelease: false - body: | - ## 💾 Download link - This release candidate of Slimefun4 can be downloaded here: - https://blob.build/project/Slimefun4/RC - - ### ❓ How to install Slimefun - Simply drag & drop the Slimefun4 jar file into the `/plugins/` directory of your server. - If you need any help installing Slimefun, feel free to check out our wiki article on [How to install Slimefun](https://github.com/Slimefun/Slimefun4/wiki/Installing-Slimefun). - - ## 📝 Change log - You can find a short summary of all the changes that are included in this release right here: - https://github.com/Slimefun/Slimefun4/blob/master/CHANGELOG.md#release-candidate-${{ github.event.inputs.number }}-${{ github.event.inputs.release_date }} - - ## 📦 Maven dependency reference - If you want to develop an addon for Slimefun ([Developer Reference](https://github.com/Slimefun/Slimefun4/wiki/Developer-Guide)), then you can build your project against this specific version of Slimefun using the following `pom.xml` dependency: - ```xml - - - jitpack.io - https://jitpack.io - - - - - - com.github.Slimefun - Slimefun4 - RC-${{ github.event.inputs.number }} - - - ``` diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000000..f388423185 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,12 @@ +name: Release + +on: + push: + tags: + - "v*" + +jobs: + release: + permissions: + contents: write + uses: Slimefun5/workflows/.github/workflows/release.yaml@stable diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml deleted file mode 100644 index 2702fbb6c8..0000000000 --- a/.github/workflows/sonarcloud.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: SonarCloud Scanner - -on: - pull_request: - types: [opened, synchronize, reopened] - -permissions: - contents: read - -jobs: - scan: - - name: SonarCloud Scanner - runs-on: ubuntu-latest - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - with: - fetch-depth: 0 - - - name: Set up JDK 21 - uses: actions/setup-java@v4.6.0 - with: - distribution: 'adopt' - java-version: '21' - java-package: jdk - architecture: x64 - - - name: Cache SonarCloud packages - uses: actions/cache@v4 - with: - path: ~/.sonar/cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: SonarCloud analysis - run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - if: ${{ env.SONAR_TOKEN != 0 }} diff --git a/.github/workflows/translator-webhook.yml b/.github/workflows/translator-webhook.yml deleted file mode 100644 index ec8328f899..0000000000 --- a/.github/workflows/translator-webhook.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Translation Notifier - -on: - push: - branches: - - master - paths: - - 'src/main/resources/languages/en/**.yml' - -permissions: - contents: read - -jobs: - notify: - - name: Translation-Notifier - runs-on: ubuntu-latest - if: github.repository == 'Slimefun/Slimefun4' - - steps: - - name: Discord Notification - uses: Ilshidur/action-discord@master - with: - args: '<@&665202905271369776> New strings have been added to Slimefun4''s language files. You can translate them at https://crowdin.com/project/slimefun' - env: - DISCORD_WEBHOOK: ${{ secrets.TRANSLATOR_WEBHOOK }} diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml deleted file mode 100644 index a1e22c99c5..0000000000 --- a/.github/workflows/yaml-linter.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: YAML Linter - -on: - push: - paths: - - '**.yml' - pull_request: - branches: - - master - -permissions: - contents: read - -jobs: - linter: - - name: YAML Linter - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: YAML Linter - uses: ibiqlik/action-yamllint@v3.1.1 - with: - config_file: '.github/configs/yaml-linter.yml' diff --git a/.gitignore b/.gitignore index a6d46cc670..595449c7d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,20 @@ -/bin/ -/target/ -/plugins/ -/sonar/ -/.settings/ -/.idea/ -/.vscode/ -/data-storage/ -/javadocs/ +# Gradle +.gradle/ +build/ +out/ +bin/ +.idea/ +*.iml +*.iws -dependency-reduced-pom.xml +# MacOS +.DS_Store -.classpath -.factorypath -.project -*.iml -*.bak -.DS_Store \ No newline at end of file +# Temporary files +*.tmp +*.log + +target/ + +# Server runtime (test server) +run/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 453eb54984..71cd21ba3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -130,7 +130,7 @@ * Fixed backpack dupe within cargo (#3379) ## Release Candidate 34 (20 Jun 2023) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#34 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#34 #### Additions * Added "Cobbled Deepslate -> Gravel" recipe to the Grind Stone @@ -171,7 +171,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#34 * Fixed #3414 ## Release Candidate 33 (07 Jan 2023) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#33 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#33 #### Additions * (API) Added Tinted Glass to "GLASS_BLOCKS" tag @@ -205,7 +205,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#33 * Fixed BlockPlacer being able to place disabled items ## Release Candidate 32 (26 Jun 2022) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#32 #### Additions * Added Organic Food for Seagrass @@ -224,7 +224,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32 * Fixed an issue with machines being placed below y=0 ## Release Candidate 31 (14 Mar 2022) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#31 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#31 #### Additions * Added Armored Jetpack @@ -267,7 +267,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#31 * Fixed #3336 (again) ## Release Candidate 30 (31 Dec 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#30 #### Additions * Added a ton of wiki links to the guide @@ -289,7 +289,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30 * Fixed (Easter) Apple Pie recipe yielding (Christmas) Apple Pies ## Release Candidate 29 (07 Nov 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#29 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#29 #### Additions * Added support for deepslate ores and copper with the Hercules' Pickaxe @@ -318,25 +318,25 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#29 * Fixed smithing table issue on 1.15 and lower ## Release Candidate 28 (06 Sep 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#28 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#28 #### Fixes * Fixed Metrics * Fixed some naming conventions and localization keys for RC-27 ## Release Candidate 27 (03 Sep 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#27 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#27 ### **Breaking Changes (API)** -This RC brings a lot of breaking changes to the API. For more info on why we did this and what happened [please refer to our PSA](https://github.com/Slimefun/Slimefun4/pull/3139) +This RC brings a lot of breaking changes to the API. For more info on why we did this and what happened [please refer to our PSA](https://github.com/Slimefun5/Slimefun5/pull/3139) * Category has been renamed to ItemGroup. -* All Category / ItemGroup variants have been relocated to `io.github.thebusybiscuit.slimefun4.api.items.groups` -* The SlimefunItem class has been relocated to `io.github.thebusybiscuit.slimefun4.api.items` -* The SlimefunItemStack class has been relocated to `io.github.thebusybiscuit.slimefun4.api.items` -* The ItemHandler class has been relocated to `io.github.thebusybiscuit.slimefun4.api.items` -* The RecipeType class has been relocated to `io.github.thebusybiscuit.slimefun4.api.recipes` -* Research classes have been moved from `io.github.thebusybiscuit.slimefun4.core.researching` to `io.github.thebusybiscuit.slimefun4.api.researches` +* All Category / ItemGroup variants have been relocated to `io.github.thebusybiscuit.slimefun5.api.items.groups` +* The SlimefunItem class has been relocated to `io.github.thebusybiscuit.slimefun5.api.items` +* The SlimefunItemStack class has been relocated to `io.github.thebusybiscuit.slimefun5.api.items` +* The ItemHandler class has been relocated to `io.github.thebusybiscuit.slimefun5.api.items` +* The RecipeType class has been relocated to `io.github.thebusybiscuit.slimefun5.api.recipes` +* Research classes have been moved from `io.github.thebusybiscuit.slimefun5.core.researching` to `io.github.thebusybiscuit.slimefun5.api.researches` * The main class `SlimefunPlugin` was renamed to `Slimefun` * CS-CoreLib2 was removed and replaced by dough @@ -373,7 +373,7 @@ This RC brings a lot of breaking changes to the API. For more info on why we did * Fixed Ender Lumps showing an incorrect recipe in the guide ## Release Candidate 26 (20 Jul 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#26 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#26 #### Additions * Diamonds can now be ground into Carbon using a Grind Stone @@ -395,7 +395,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#26 * Fixed #3136 ## Release Candidate 25 (20 Jun 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#25 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#25 #### Additions * Added "4 Charcoal -> 1 Coal" recipe to the Compressor @@ -424,7 +424,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#25 * Fixed #3116 ## Release Candidate 24 (03 Jun 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#24 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#24 #### Additions * (API) Added AsyncMachineOperationFinishEvent @@ -457,7 +457,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#24 * Fixed #3095 ## Release Candidate 23 (19 May 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#23 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#23 #### Additions * Added "Quartz Block -> 4 Quartz" recipe to Grind Stone @@ -505,7 +505,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#23 * Fixed #3060 ## Release Candidate 22 (18 Apr 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#22 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#22 #### Additions * Added Vanilla Auto-Crafter @@ -557,7 +557,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#22 * Fixed #2942 ## Release Candidate 21 (14 Mar 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#21 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#21 #### Additions * Nether Wart Blocks can now be turned into Nether Warts using a Grind Stone @@ -601,7 +601,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#21 * Fixed #2883 ## Release Candidate 20 (30 Jan 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#20 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#20 #### Additions * Added a new language: Bulgarian @@ -640,7 +640,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#20 * Fixed #2679 ## Release Candidate 19 (11 Jan 2021) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#19 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#19 #### Additions * Added Bee Armor (1.15+ only) @@ -667,7 +667,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#19 * Fixed #2675 ## Release Candidate 18 (03 Dec 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#18 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#18 #### Additions * The Smelters Pick now also works on Ancient Debris @@ -733,7 +733,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#18 * Fixed #2583 ## Release Candidate 17 (17 Oct 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#17 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#17 #### Additions * Added /sf charge @@ -806,7 +806,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#17 * Fixed a dupe bug with mcMMO ## Release Candidate 16 (07 Sep 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#16 #### Additions * Added an option for Industrial Miners to mine Ancient Debris @@ -894,7 +894,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16 * Fixed Teleports getting stuck sometimes ## Release Candidate 15 (01 Aug 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#15 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#15 #### Additions * Added "Bone Block -> Bone meal" recipe to the Grind Stone @@ -949,7 +949,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#15 * Fixed #2166 ## Release Candidate 14 (12 Jul 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#14 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#14 #### Additions * Added support for Minecraft 1.16 @@ -1028,7 +1028,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#14 * Fixed a NullPointerException when Generators throw an Error Report ## Release Candidate 13 (16 Jun 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#13 #### Additions * Added Dried Kelp Blocks recipe to the Electric Press @@ -1079,7 +1079,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 * Fixed research fireworks still dealing damage sometimes ## Release Candidate 12 (27 May 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#12 #### Additions * Added Ukrainian translations @@ -1124,7 +1124,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12 * Fixed #1935 ## Release Candidate 11 (25 Apr 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#11 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#11 #### Additions * Added GEOResourceGenerationEvent @@ -1182,7 +1182,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#11 * Fixed GPS Emergency Transmitters not working ## Release Candidate 10 (28 Mar 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#10 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#10 #### Additions * Added some new charts to bStats @@ -1229,19 +1229,19 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#10 * Fixed #1768 ## Release Candidate 9 (07 Mar 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#9 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#9 #### Fixes * Fixed Solar Generators not working ## Release Candidate 8 (06 Mar 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#8 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#8 #### Fixes * Fixed bStats Metrics not sending properly ## Release Candidate 7 (06 Mar 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#7 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#7 #### Additions * Added translations for Recipe Types @@ -1265,7 +1265,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#7 * Fixed #1613 ## Release Candidate 6 (16 Feb 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#6 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#6 #### Additions * Added a new language: Japanese @@ -1284,7 +1284,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#6 * Fixed magician talisman not being able to enchant books ## Release Candidate 5 (09 Feb 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#5 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#5 #### Additions * Added preset messages.yml files @@ -1338,7 +1338,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#5 * Fixed Android Script Component textures ## Release Candidate 4 (06 Jan 2020) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#4 #### Additions * Added 1.15 support (1.14 and 1.15 are both supported) @@ -1414,7 +1414,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 * Fixed #1354 ## Release Candidate 3 (21 Nov 2019) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#3 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#3 #### Additions * Smeltery now shows some recipes in the guide @@ -1465,7 +1465,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#3 * Fixed Ancient Altar allowing you to craft locked items ## Release Candidate 2 (29 Sep 2019) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#2 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#2 #### Additions * Added GEO - Miner @@ -1482,6 +1482,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#2 * Fixed Auto-Updater for stable builds ## Release Candidate 1 (26 Sep 2019) -https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#1 +https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/#1 * First "stable" release since over a year. Stable builds will NOT receive support for bug reports since they are technically outdated. + diff --git a/CONTENT.md b/CONTENT.md new file mode 100644 index 0000000000..a209ee7d46 --- /dev/null +++ b/CONTENT.md @@ -0,0 +1,22 @@ +It offers everything you could possibly imagine, from Backpacks to Jetpacks! Slimefun lets every player decide on their own how much they want to dive into Magic or Tech. +We got everything from magical wands to nuclear reactors. +We feature a magical altar, an electric power grid and even item transport systems. + +## Features + +* Over 500+ New Items and Recipes +* Magic, Tech, and Utility features +* Extensive Addon Support (expand Slimefun with dozens of community addons) +* Multiblock Machines and Automated Crafting +* Energy Networks and Cargo Transport Systems + +## Addons + +Slimefun has a rich ecosystem of Addons developed by the community. You can find addons that add new dimensions, new machines, custom crops, and much more. + +## Compiling + +To build Slimefun from source, simply clone the repository and run: +```bash +./gradlew build +``` diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e6d01d2e8..721ef0ae54 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,15 @@ # Contributing to Slimefun This document outlines various ways how you can help contribute to Slimefun and make this a bigger and better project.
-All contributions must be inline with our [Code of Conduct](https://github.com/Slimefun/Slimefun4/blob/master/.github/CODE_OF_CONDUCT.md) and [License](https://github.com/Slimefun/Slimefun4/blob/master/LICENSE). +All contributions must be inline with our [Code of Conduct](https://github.com/Slimefun5/Slimefun5/blob/master/.github/CODE_OF_CONDUCT.md) and [License](https://github.com/Slimefun5/Slimefun5/blob/master/LICENSE). Please also follow the templates for Issues and Pull Requests we provide. ## :beetle: 1. Issues: Bug Reports One of the foundations for good software is reliability. To facilitate this reliability, our community must work together to crush bugs that arise. This of course requires good information and knowledge about ongoing bugs and issues though. -You can help this project by reporting a bug on our [Issues Tracker](https://github.com/Slimefun/Slimefun4/issues).
+You can help this project by reporting a bug on our [Issues Tracker](https://github.com/Slimefun5/Slimefun5/issues).
Please adhere to the provided template and provide as much information as possible. -For more info on how to make good and helpful bug reports, check out our article on [How to report bugs](https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs). +For more info on how to make good and helpful bug reports, check out our article on [How to report bugs](https://github.com/Slimefun5/Slimefun5/wiki/How-to-report-bugs). If you encounter an issue which has already been reported, please don't open a new one.
It would be awesome though if you could post a comment on the existing issue which explains how you were able to reproduce this yourself. @@ -17,10 +17,10 @@ The more context and information we get, the easier we can fix it. ## :hammer_and_wrench: 2. Pull Requests: Bug Fixes Bugs that have been reported need to be fixed of course.
-Any open Issue on our [Issues Tracker](https://github.com/Slimefun/Slimefun4/issues) is waiting to be fixed. +Any open Issue on our [Issues Tracker](https://github.com/Slimefun5/Slimefun5/issues) is waiting to be fixed. This is an Open-Source project and we love Pull Requests. -So if you have an idea on how to approach a known issue, feel free to make a [Pull Request](https://github.com/Slimefun/Slimefun4/pulls) which fixes this bug. +So if you have an idea on how to approach a known issue, feel free to make a [Pull Request](https://github.com/Slimefun5/Slimefun5/pulls) which fixes this bug. You can also comment on the existing Issue, proposing your idea or communicating that you wanna work on this. ## :wrench: 3. Pull Requests: Additions/Changes @@ -34,7 +34,7 @@ Suggestions which gotten enough votes will be moved to `#approved`. Therefore our `#approved` is a great place to start looking for ideas on what to add or change, since it will definitely be something a large number of people agree with. Also consider making an addon for your additions when they get too large, too abstract or too "niche". -You can check out our [Developer Guide](https://github.com/Slimefun/Slimefun4/wiki/Developer-Guide) for a guide on how to create a Slimefun addon.. +You can check out our [Developer Guide](https://github.com/Slimefun5/Slimefun5/wiki/Developer-Guide) for a guide on how to create a Slimefun addon.. ## :earth_africa: 4. Pull Requests: Translations Another great way to contribute to Slimefun is by working on translations for the project. @@ -46,7 +46,7 @@ One of our Language Moderators will review the changes and submit a Pull Request Very active community translators will have the option to become a "Language Moderator". Language Moderators are responsible for proof-reading any new translations for their designated language and correct it when they see a mistake. -For more info on how or what to translate, check out our article on [How to translate Slimefun](https://github.com/Slimefun/Slimefun4/wiki/Translating-Slimefun). +For more info on how or what to translate, check out our article on [How to translate Slimefun](https://github.com/Slimefun5/Slimefun5/wiki/Translating-Slimefun). ## :scroll: 5. Pull Requests: Wiki contributions Slimefun is a very large project and might be quite intimidating for new players. @@ -55,12 +55,12 @@ If you have played with Slimefun for a while and gotten yourself familiar with h It would help out a lot :heart: You can find a tutorial on how to contribute to our wiki right here:
-https://github.com/Slimefun/Slimefun4/wiki/Expanding-the-Wiki +https://github.com/Slimefun5/Slimefun5/wiki/Expanding-the-Wiki ## :star: 6. Pull Requests: Code Quality -Slimefun uses [sonarcloud.io](https://sonarcloud.io/dashboard?id=Slimefun_Slimefun4) to monitor Code Quality. +Slimefun uses [sonarcloud.io](https://sonarcloud.io/dashboard?id=Slimefun_Slimefun5) to monitor Code Quality. -We always welcome quality improvements to the code and the "Code Smells" section on [sonarcloud.io](https://sonarcloud.io/dashboard?id=Slimefun_Slimefun4) is a great place to start. +We always welcome quality improvements to the code and the "Code Smells" section on [sonarcloud.io](https://sonarcloud.io/dashboard?id=Slimefun_Slimefun5) is a great place to start. But please keep in mind that some design patterns may not be changed too abruptly if an addon depends on them. To prevent any accidents from happening, please contact us on our [Discord Server](https://discord.gg/slimefun) before-hand and state your intended changes. @@ -70,21 +70,21 @@ Code documentation is also a great way to improve the maintainability of the pro 2. Classes should also include an `@author` tag to indicate who worked on that class. 3. Methods and parameters should be annotated with `@Nullable` or `@Nonnull` to indicate whether or not null values are accepted. -Feel free to visit our [Javadocs](https://slimefun.github.io/javadocs/Slimefun4/docs/overview-summary.html) +Feel free to visit our [Javadocs](https://slimefun.github.io/javadocs/Slimefun5/docs/overview-summary.html) #### Unit Tests Unit Tests help us test the project to work as intended in an automated manner.
-More or better Unit Tests are always good to have, so feel free to submit a Test and place it in our [src/test/java](https://github.com/Slimefun/Slimefun4/tree/master/src/test/java/io/github/thebusybiscuit/slimefun4/testing) directory +More or better Unit Tests are always good to have, so feel free to submit a Test and place it in our [src/test/java](https://github.com/Slimefun5/Slimefun5/tree/master/src/test/java/io/github/thebusybiscuit/slimefun5/testing) directory We are using [Junit 5 - Jupiter](https://github.com/junit-team/junit5/) and [MockBukkit](https://github.com/seeseemelk/MockBukkit) as our testing environment.
Every new Unit Test should have a `@DisplayName` annotation with a plain text description on what the Unit Test tests. -## :toolbox: How to compile Slimefun4 +## :toolbox: How to compile Slimefun5 Slimefun is written in Java and uses [Maven](https://maven.apache.org/) for compilation.
To compile Slimefun yourself, follow these steps: 1. Clone the project via git
-`$ git clone https://github.com/Slimefun/Slimefun4/` +`$ git clone https://github.com/Slimefun5/Slimefun5/` 2. Compile the project using Maven
`$ mvn clean package` 3. Extract the compiled `Slimefun-v4.X-UNOFFICIAL.jar` from your `/target/` directory. @@ -144,7 +144,7 @@ But do try to follow our code style as best as you can.* * Constants (`static final` fields) should be in *SCREAMING_SNAKE_CASE* (e.g. `MY_CONSTANT_FIELD`) * Variables, parameters and fields should be in *camelCase* (e.g. `myVariableOrField`) * All methods should be in *camelCase* (e.g. `myMethod`) -* Packages must be all lowercase, consecutive words should generally be avoided. (e.g. `io.github.thebusybiscuit.slimefun4.core.something`) +* Packages must be all lowercase, consecutive words should generally be avoided. (e.g. `io.github.thebusybiscuit.slimefun5.core.something`) #### 7. Style preferences * Use **Spaces**, not Tabs! * One class per file! Please don't put multiple classes into one file, this also applies to enums, make a seperate file for new classes or enums. @@ -200,3 +200,4 @@ private void example(int x) { } } ``` + diff --git a/README.md b/README.md deleted file mode 100644 index affc3ed96c..0000000000 --- a/README.md +++ /dev/null @@ -1,165 +0,0 @@ -# Slimefun 4 -*Looking for the download link? [**Click here**](https://github.com/Slimefun/Slimefun4/blob/master/README.md#floppy_disk-download-slimefun-4)* - -Slimefun is a plugin which aims to turn your Spigot Server into a modpack without ever installing a single mod. It offers everything you could possibly imagine. From Backpacks to Jetpacks! Slimefun lets every player decide on their own how much they want to dive into Magic or Tech.
-We got everything from magical wands to nuclear reactors.
-We feature a magical altar, an electric power grid and even item transport systems. - -This project originally started back **in 2013** and has grown ever since.
-From one single person working on this plugin back then, we grew to a community of thousands of players and hundreds of contributors to this project.
-It currently adds over **500 new items and recipes** to Minecraft ([Read more about the history of this project](https://github.com/Slimefun/Slimefun4/wiki/Slimefun-in-a-nutshell)). - -But it also comes with a lot of addons! Check out our [addons](https://github.com/Slimefun/Slimefun4/wiki/Addons), you may find exactly what you were looking for. - -### Quick navigation -* **[:floppy_disk: Download Slimefun4](#floppy_disk-download-slimefun-4)** -* **[:framed_picture: Screenshots](#framed_picture-screenshots)** -* **[:headphones: Discord Support Server](#headphones-discord)** -* **[:beetle: Bug Tracker](https://github.com/Slimefun/Slimefun4/issues)** -* **[:open_book: Wiki](https://github.com/Slimefun/Slimefun4/wiki)** -* **[:interrobang: FAQ](https://github.com/Slimefun/Slimefun4/wiki/FAQ)** -* **[:handshake: How to contribute](https://github.com/Slimefun/Slimefun4/blob/master/CONTRIBUTING.md)** - -## :floppy_disk: Download Slimefun 4 -Slimefun requires your Minecraft Server to be running on [Spigot](https://spigotmc.org/), [Paper](https://papermc.io/) or on any fork of these.
-(See also: [How to install Slimefun](https://github.com/Slimefun/Slimefun4/wiki/Installing-Slimefun)) - -Slimefun 4 can be downloaded **for free** on our builds page.
-We currently provide two distinct versions of Slimefun, development builds and "stable" builds.
-Here is a full summary of the differences between the two different versions of Slimefun. - -| | development (latest) | "stable" | -| ------------------ | -------- | -------- | -| **Minecraft version(s)** | :video_game: **1.16.\* - 1.20.\*** | :video_game: **1.16.\* - 1.20.\*** | -| **Java version** | :computer: **Java 16 (or higher)** | :computer: **Java 16 (or higher)** | -| **automatic updates** | :heavy_check_mark: | :heavy_check_mark: | -| **frequent updates** | :heavy_check_mark: | :x: | -| **latest content** | :heavy_check_mark: | :x: | -| **Discord support** | :heavy_check_mark: | :x: | -| **Bug Reports** | :heavy_check_mark: | :x: | -| **testing before release** | :x: | :heavy_check_mark: | -| **change logs** | :x: | :memo: **[change log](https://github.com/Slimefun/Slimefun4/blob/master/CHANGELOG.md)** | -| **Download links** | :floppy_disk: **[download latest](https://blob.build/project/Slimefun4/Dev)** | :floppy_disk: **[download "stable"](https://blob.build/project/Slimefun4/RC)** | - -**:exclamation: We wholeheartedly recommend you to use _development builds_, they are the most recent version of Slimefun and also receive the most frequent updates! In fact, "stable" builds are so outdated that we won't accept bug reports from them at all.** -
- Here's why... - -"Stable" builds do not receive frequent updates or fast patches. As time goes on, bugs are fixed but it will take some time until these fixes make it into a "stable" build. We will also not accept or review any bug reports from "stable" builds. They are in fact just old development builds that seemed to run fine without any __major__ issues. - -**:question: Why use a "stable" build then?**
-While "stable" builds most definitely contain more bugs than development builds due to their very slow update schedule. you can be sure that they will not include __game-breaking__ issues, but rest assured that development builds almost never contain such issues either. If your server or business however heavily depends on a version of Slimefun that does not change/update a lot, you are forgiven if you choose the "stable" branch. But development builds will bring you the best experience, both in terms of features and bug fixes. - -**:question: What exactly are these "stable" builds then and why do you put them in quotes?**
-"Stable" builds are literally just outdated development builds that seemed to run fine without any __major__ issues. But they are far from bug-free hence why actually calling them stable would be hypocritical. However these builds can only really stay "stable" if there are enough people using development builds and report any bugs they come across. Otherwise potential issues may go unnoticed and slip into a "stable" build. Again, we really recommend you to choose the development builds. But since a few people really wanted "stable" builds, they are now an option too. - -
- -## :framed_picture: Screenshots -So what does Slimefun look like?
-Well, we asked some users on our [Discord server](#headphones-discord) to send us some screenshots, so see for yourself: -| Reactors and electricity | Awesome factories | Magic and Altars | -| :-------------------------------------------: | :--------------------------------------: | :----------------------------------------: | -| ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase1.png) | ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase6.png) | ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase5.png) | -| *Screenshot provided by HamtaBot#0001* | *Screenshot provided by Piͭxͪeͤl (mnb)#5049* | *Screenshot provided by Kilaruna#4981* | -| ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase4.png) | ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase3.png) | ![](https://raw.githubusercontent.com/Slimefun/Slimefun-Wiki/master/images/showcase2.png) | -| *Screenshot provided by GalaxyKat11#3816* | *Screenshot provided by TamThan#7987* | *Screenshot provided by Kilaruna#4981* | - -## :headphones: Discord -You can find Slimefun's community on Discord and connect with **over 7000** users of this plugin from all over the world.
-Click the badge down below to join the server for suggestions/questions or other discussions about this plugin.
-We are also hosting a community event every so often, join us to find out more.
-**Important: We don't accept bug reports on discord, please use our [Issue Tracker](https://github.com/Slimefun/Slimefun4/issues) to submit bug reports!** - -Due to the sheer size of this discord server, we need to enforce some [important rules](https://github.com/Slimefun/Slimefun4/wiki/Discord-Rules).
-Not following these rules can lead to a kick or even a ban from the server. - -

- - Discord Invite - -

- -## :open_book: Wiki -Slimefun has a (detailed and well-maintained - *cough*) Wiki for new players, maybe also consider -expanding the wiki to help grow our community and help out new users of this plugin. -https://github.com/Slimefun/Slimefun4/wiki - -#### :star: Highlighted Articles -* [What is Slimefun?](https://github.com/Slimefun/Slimefun4/wiki/Slimefun-in-a-nutshell) -* [How to install Slimefun](https://github.com/Slimefun/Slimefun4/wiki/Installing-Slimefun) -* [Addons for Slimefun 4](https://github.com/Slimefun/Slimefun4/wiki/Addons) -* [How to create an Addon for Slimefun 4](https://github.com/Slimefun/Slimefun4/wiki/Developer-Guide) -* [Getting Started](https://github.com/Slimefun/Slimefun4/wiki/Getting-Started) -* [Frequently Asked Questions](https://github.com/Slimefun/Slimefun4/wiki/FAQ) -* [Common issues](https://github.com/Slimefun/Slimefun4/wiki/Common-Issues) -* [Help us expand the Wiki!](https://github.com/Slimefun/Slimefun4/wiki/Expanding-the-Wiki) -* [Help us translate Slimefun!](https://github.com/Slimefun/Slimefun4/wiki/Translating-Slimefun) - -The wiki is entirely community-run, so if you find an article missing, feel free to write one and share it with others. - -## :handshake: Contributing to this project -Slimefun 4 is an Open-Source project and licensed under -[GNU GPLv3](https://github.com/Slimefun/Slimefun4/blob/master/LICENSE).
-**Over 200 people have already contributed to this amazing project. You guys are awesome! :heart:**
-Please consider helping us maintain this project too, your engagement keeps the project alive! - -You can find more info on how to contribute to this project in our [CONTRIBUTING.md](https://github.com/Slimefun/Slimefun4/blob/master/CONTRIBUTING.md). - -## :exclamation: Disclaimers -Slimefun4 uses various systems that collect usage information or download automatic updates as well as the latest information about the project. -We do not collect any personal information from you but there are some services that may gather or download some form of data. - -You can opt-out of the Auto-Updater and stats collection at any time! - -
- Automatic updates - -Slimefun4 uses an Auto-Updater which connects to https://thebusybiscuit.github.io/builds/ to check for and download updates.
-This behaviour is enabled by default but can be turned off under `/plugins/Slimefun/config.yml`.
-We highly recommend you to keep this on at any time though, as you could be missing out on important patches. -
- -
- Metrics and Statistics - -Slimefun4 uses [bStats](https://bstats.org/plugin/bukkit/Slimefun/4574) to collect anonymous information about the usage of this plugin.
-This is solely for statistical purposes, as we are interested in how Servers/Players use this plugin.
-All available data is anonymous and aggregated, at no point can we see individual server or player information.
-All of the collected data is publicly accessible: https://bstats.org/plugin/bukkit/Slimefun/4574 - -You can also disable this behaviour under `/plugins/bStats/config.yml`.
-For more info see [bStats' Privacy Policy](https://bstats.org/privacy-policy) - -Our [bStats Module](https://github.com/Slimefun/MetricsModule) is downloaded automatically when installing this Plugin, this module will automatically update on server starts independently from the main plugin. This way we can automatically roll out updates to the bStats module, in cases of severe performance issues for example where live data and insight into what is impacting performance can be crucial. -These updates can of course be disabled under `/plugins/Slimefun/config.yml`. To disable metrics collection as a whole, see the paragraph above. - ---- - -Slimefun also uses its own analytics system to collect anonymous information about the performance of this plugin.
-This is solely for statistical purposes, as we are interested in how it's performing for all servers.
-All available data is anonymous and aggregated, at no point can we see individual server information.
- -You can also disable this behaviour under `/plugins/Slimefun/config.yml`.
- -
- -
- GitHub Integration - -Lastly, Slimefun4 connects to https://api.github.com/ to gather information about this open-source project.
-No information about you or your Minecraft Server is sent to GitHub. - -This information includes (but is not limited to) -* list of contributors, their username and profile link (from the repositories `Slimefun/Slimefun4`, `Slimefun/Slimefun-Wiki` and `Slimefun/Resourcepack`) -* amount of open issues in this repository -* amount of pending pull requests in this repository -* amount of stars in this repository -* amount of forks of this repository -* amount of code-bytes in this repository -* date of the last commit to this repository -
- -Additionally the plugin connects to [textures.minecraft.net](https://www.minecraft.net/en-us) to retrieve the Minecraft skins of our contributors (if possible).
- -*Note that Slimefun is not associated with `Mojang Studios` or `Minecraft`.* diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000..ebc36bfef8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,265 @@ +import java.util.concurrent.TimeUnit +plugins { + java + id("com.gradleup.shadow") + id("io.github.intisy.github-gradle") + id("xyz.jpenilla.run-paper") +} + +group = "com.github.slimefun" +version = "5.0.0-UNOFFICIAL" +description = "Slimefun is a Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server." + +github { + accessToken = System.getenv("GITHUB_TOKEN") ?: "" + publish { + tag = System.getenv("GITHUB_REF_NAME") + } +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +repositories { + mavenCentral() + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") // Spigot + maven("https://repo.papermc.io/repository/maven-public/") // Paper + maven("https://jitpack.io") // dough, MockBukkit, ItemsAdder + maven("https://maven.enginehub.org/repo/") // WorldEdit + maven("https://repo.extendedclip.com/content/repositories/placeholderapi") // PlaceholderAPI + maven("https://nexus.neetgames.com/repository/maven-public") // mcMMO + maven("https://repo.walshy.dev/public") // ClearLag + maven("https://repo.codemc.io/repository/maven-public/") // Orebfuscator +} + +dependencies { + implementation("com.github.Slimefun.dough:dough-api:cb22e71335") + implementation("io.papermc:paperlib:1.0.8") + implementation("commons-lang:commons-lang:2.6") + + compileOnly("com.google.code.findbugs:jsr305:3.0.2") + compileOnly("io.papermc.paper:paper-api:${property("paperApiVersion")}") + compileOnly("com.mojang:authlib:6.0.52") { isTransitive = false } + + compileOnly("com.sk89q.worldedit:worldedit-core:7.3.9") { isTransitive = false } + compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.3.9") { isTransitive = false } + compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.029") { isTransitive = false } + compileOnly("me.clip:placeholderapi:2.11.6") { isTransitive = false } + compileOnly("me.minebuilders:clearlag-core:3.1.6") { isTransitive = false } + compileOnly("com.github.LoneDev6:itemsadder-api:3.6.1") { isTransitive = false } + compileOnly("net.imprex:orebfuscator-api:5.4.0") { isTransitive = false } + + testImplementation(platform("org.junit:junit-bom:5.11.4")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("org.mockito:mockito-core:5.15.2") + testImplementation("org.slf4j:slf4j-simple:2.0.16") + testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v26.1.2:4.113.1") { + exclude(group = "org.jetbrains", module = "annotations") + } +} + +configurations { + testImplementation { + extendsFrom(configurations.compileOnly.get()) + } +} + +tasks { + compileJava { + options.encoding = "UTF-8" + options.compilerArgs.add("-Xlint:-deprecation") + exclude("**/package-info.java") + } + + compileTestJava { + options.encoding = "UTF-8" + } + + processResources { + filesMatching("plugin.yml") { + expand("version" to project.version) + } + } + + jar { + enabled = false + } + + shadowJar { + archiveFileName.set("Slimefun v${project.version}-MC26.1.2.jar") + + relocate("io.github.bakedlibs.dough", "io.github.thebusybiscuit.slimefun5.libraries.dough") + relocate("io.papermc.lib", "io.github.thebusybiscuit.slimefun5.libraries.paperlib") + relocate("org.apache.commons.lang", "io.github.thebusybiscuit.slimefun5.libraries.commons.lang") + + exclude("META-INF/**") + + exclude("io/github/bakedlibs/dough/skins/**") + + from(rootProject.projectDir) { + include("LICENSE") + } + } + + test { + useJUnitPlatform() + } + + build { + dependsOn(shadowJar) + } +} + +val cloneAndBuildAddons by tasks.registering { + group = "slimefun" + description = "Clones or pulls and compiles specified addons from GitHub" + + doLast { + var addonsProp = project.findProperty("addons") as String? ?: "" + + if (addonsProp.isBlank()) { + addonsProp = project.findProperty("slimefunAddons") as String? ?: "" + } + + if (addonsProp.isBlank()) { + println("No addons specified in -Paddons or default-addons.txt") + return@doLast + } + + val addonsSrcDir = project.layout.buildDirectory.dir("addons-src").get().asFile + addonsSrcDir.mkdirs() + + val pluginsDir = project.layout.projectDirectory.dir("run/plugins").asFile + pluginsDir.mkdirs() + + val addons = addonsProp.split(",") + + fun getGitHash(dir: File): String { + try { + val proc = ProcessBuilder("git", "rev-parse", "HEAD") + .directory(dir) + .redirectErrorStream(true) + .start() + proc.waitFor() + return proc.inputStream.bufferedReader().readText().trim() + } catch (e: Exception) { + return "" + } + } + + val buildTimeoutMinutes = 5L + + fun runProcess(pb: ProcessBuilder, timeoutMinutes: Long = buildTimeoutMinutes): Int { + pb.redirectErrorStream(true) + pb.redirectInput(ProcessBuilder.Redirect.from( + if (org.gradle.internal.os.OperatingSystem.current().isWindows) File("NUL") else File("/dev/null") + )) + val proc = pb.start() + val output = StringBuilder() + val reader = proc.inputStream.bufferedReader() + val readerThread = Thread { + reader.forEachLine { output.appendLine(it) } + } + readerThread.start() + val finished = proc.waitFor(timeoutMinutes, TimeUnit.MINUTES) + if (!finished) { + proc.destroyForcibly() + readerThread.join(2000) + println(output) + println("ERROR: Process timed out after $timeoutMinutes minutes.") + return -1 + } + readerThread.join(2000) + val exitCode = proc.exitValue() + if (exitCode != 0) { + println(output) + } + return exitCode + } + + for (addon in addons) { + val parts = addon.split("/") + if (parts.size != 2) { + println("Invalid addon format: $addon. Expected Owner/Repo") + continue + } + val repo = parts[1] + + val repoDir = File(addonsSrcDir, repo) + val isWindows = org.gradle.internal.os.OperatingSystem.current().isWindows + + val oldHash = if (repoDir.exists()) getGitHash(repoDir) else "" + + if (repoDir.exists()) { + println("Pulling latest for $addon...") + runProcess(ProcessBuilder("git", "fetch", "--all").directory(repoDir), 2) + runProcess(ProcessBuilder("git", "remote", "set-head", "origin", "-a").directory(repoDir), 1) + val aheadProc = ProcessBuilder("git", "rev-list", "--count", "origin/HEAD..HEAD") + .directory(repoDir).redirectErrorStream(true).start() + aheadProc.waitFor() + val aheadCount = aheadProc.inputStream.bufferedReader().readText().trim().toIntOrNull() ?: 0 + if (aheadCount > 0) { + println(" Local branch is $aheadCount commit(s) ahead of origin - preserving local fixes.") + } else { + runProcess(ProcessBuilder("git", "reset", "--hard", "origin/HEAD").directory(repoDir), 1) + } + } else { + println("Cloning $addon...") + runProcess(ProcessBuilder("git", "clone", "https://github.com/$addon.git").directory(addonsSrcDir), 5) + } + + val newHash = getGitHash(repoDir) + val libsDir = File(repoDir, "build/libs") + val jars = libsDir.listFiles { file: File -> file.name.endsWith(".jar") && !file.name.endsWith("-javadoc.jar") && !file.name.endsWith("-sources.jar") } + val hasCompiledJar = jars != null && jars.isNotEmpty() + + val aheadCheck = ProcessBuilder("git", "rev-list", "--count", "origin/HEAD..HEAD") + .directory(repoDir).redirectErrorStream(true).start() + aheadCheck.waitFor() + val localAhead = aheadCheck.inputStream.bufferedReader().readText().trim().toIntOrNull() ?: 0 + + if (oldHash == newHash && oldHash.isNotBlank() && hasCompiledJar && localAhead == 0) { + println("No updates found for $addon. Skipping build.") + val targetJar = jars!!.firstOrNull { it.name.contains("v") || it.name.contains("shadow") } ?: jars!![0] + println("Copying ${targetJar.name} to plugins folder...") + targetJar.copyTo(File(pluginsDir, targetJar.name), overwrite = true) + continue + } + + println("Building $addon...") + val gradlewCmd = if (isWindows) "gradlew.bat" else "./gradlew" + val buildPb = if (isWindows) { + ProcessBuilder("cmd", "/c", "$gradlewCmd shadowJar") + } else { + ProcessBuilder("sh", "-c", "$gradlewCmd shadowJar") + } + buildPb.directory(repoDir) + val exitCode = runProcess(buildPb, buildTimeoutMinutes) + + if (exitCode != 0) { + println("WARNING: Build failed for $addon (Exit Code: $exitCode). Skipping.") + continue + } + + val newJars = libsDir.listFiles { file: File -> file.name.endsWith(".jar") && !file.name.endsWith("-javadoc.jar") && !file.name.endsWith("-sources.jar") } + if (newJars != null && newJars.isNotEmpty()) { + val targetJar = newJars.firstOrNull { it.name.contains("v") || it.name.contains("shadow") } ?: newJars[0] + println("Copying ${targetJar.name} to plugins folder...") + targetJar.copyTo(File(pluginsDir, targetJar.name), overwrite = true) + } else { + println("WARNING: No compiled jar found for $addon") + } + } + } +} + +tasks.runServer { + dependsOn(tasks.shadowJar, cloneAndBuildAddons) + minecraftVersion("26.1.2") +} + + diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000000..c11f295676 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,453 @@ + + + 4.0.0 + com.github.slimefun + Slimefun + 4.9-UNOFFICIAL + Slimefun is a Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server. + https://github.com/Slimefun5/Slimefun5 + + GitHub Issues + https://github.com/Slimefun5/Slimefun5/issues + + 2013 + + + GNU General Public License v3.0 + https://github.com/Slimefun5/Slimefun5/blob/master/LICENSE + repo + + + + ${project.basedir}/src/main/java + ${project.basedir}/src/test/java + clean package + + + true + ${basedir}/src/main/resources + + plugin.yml + config.yml + item-models.yml + wiki.json + languages/translators.json + tags/*.json + biome-maps/*.json + languages/**/*.yml + + + + ${basedir} + + LICENSE + + + + ${project.name} v${project.version} + + + maven-compiler-plugin + 3.13.0 + + + **/package-info.java + + + + + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + + + + maven-surefire-plugin + 3.5.2 + + org.junit.jupiter:junit-jupiter + false + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 5.0.0.4389 + + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + prepare + + prepare-agent + + + + report + test + + report + + + + + + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + + + io.github.bakedlibs.dough + io.github.thebusybiscuit.slimefun5.libraries.dough + + + io.papermc.lib + io.github.thebusybiscuit.slimefun5.libraries.paperlib + + + org.apache.commons.lang + io.github.thebusybiscuit.slimefun5.libraries.commons.lang + + + + + *:* + + META-INF/* + + + + com.github.Slimefun.dough:dough-api + + io/github/bakedlibs/dough/skins/** + + + + + + + maven-javadoc-plugin + 3.11.2 + + ${project.basedir} + javadocs + Slimefun5 - Javadocs + Slimefun5 - Javadocs + false + -html5 + + ${paper.javadocs} + + + + Slimefun5 - API + io.github.thebusybiscuit.slimefun5.api* + + + Slimefun5 - Core packages + io.github.thebusybiscuit.slimefun5.core* + + + Slimefun5 - Implementations + io.github.thebusybiscuit.slimefun5.implementation* + + + Slimefun5 - Integrations with other + plugins + io.github.thebusybiscuit.slimefun5.integrations* + + + Slimefun5 - Common utility packages + io.github.thebusybiscuit.slimefun5.utils* + + + Slimefun5 - Items + io.github.thebusybiscuit.slimefun5.implementation.items* + + + Slimefun5 - Multiblocks + io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks* + + + Slimefun5 - Electrical Machines + io.github.thebusybiscuit.slimefun5.implementation.items.electric* + + + Slimefun5 - Old packages + me.mrCookieSlime.Slimefun* + + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots + + + paper-repo + https://repo.papermc.io/repository/maven-public/ + + + jitpack.io + https://jitpack.io + + + worldedit-repo + https://maven.enginehub.org/repo/ + + + placeholderapi-repo + https://repo.extendedclip.com/content/repositories/placeholderapi + + + mcmmo-repo + https://nexus.neetgames.com/repository/maven-public + + + walshy-public + https://repo.walshy.dev/public + + + codemc-repo + https://repo.codemc.io/repository/maven-public/ + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + provided + + + io.papermc.paper + paper-api + 1.21.4-R0.1-SNAPSHOT + provided + + + org.junit.jupiter + junit-jupiter + 5.11.4 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + junit-jupiter-engine + org.junit.jupiter + + + + + org.mockito + mockito-core + 5.15.2 + test + + + byte-buddy + net.bytebuddy + + + byte-buddy-agent + net.bytebuddy + + + objenesis + org.objenesis + + + + + org.slf4j + slf4j-simple + 2.0.16 + test + + + com.github.MockBukkit + MockBukkit + v4.106.1 + test + + + annotations + org.jetbrains + + + hamcrest + org.hamcrest + + + adventure-platform-bungeecord + net.kyori + + + maven-resolver-connector-basic + org.apache.maven.resolver + + + maven-resolver-transport-http + org.apache.maven.resolver + + + junit-jupiter-api + org.junit.jupiter + + + byte-buddy + net.bytebuddy + + + + + com.sk89q.worldedit + worldedit-core + 7.3.9 + provided + + + * + * + + + + + com.sk89q.worldedit + worldedit-bukkit + 7.3.9 + provided + + + * + * + + + + + com.gmail.nossr50.mcMMO + mcMMO + 2.2.029 + provided + + + * + * + + + + + me.clip + placeholderapi + 2.11.6 + provided + + + * + * + + + + + me.minebuilders + clearlag-core + 3.1.6 + provided + + + * + * + + + + + com.github.LoneDev6 + itemsadder-api + 3.6.1 + provided + + + * + * + + + + + net.imprex + orebfuscator-api + 5.4.0 + provided + + + * + * + + + + + com.mojang + authlib + 6.0.52 + provided + + + * + * + + + + + + + + org.junit + junit-bom + 5.11.4 + pom + import + + + + + https://hub.spigotmc.org/javadocs/spigot/ + 21 + https://sonarcloud.io + slimefun + DEBUG + 21 + 21 + Slimefun_Slimefun5 + 21 + UTF-8 + 1.21.4 + target/site/jacoco/jacoco.xml + + + diff --git a/docs/adr/0001-storage-layer.md b/docs/adr/0001-storage-layer.md index 0809ed04a2..fa00afae8a 100644 --- a/docs/adr/0001-storage-layer.md +++ b/docs/adr/0001-storage-layer.md @@ -35,7 +35,7 @@ We want to create a new storage layer abstraction and implementations which will be backwards-compatible but open up new ways of storing data within Slimefun. The end end goal is we can quickly and easily support new storage backends (such as binary storage, SQL, etc.) for things like -[PlayerProfile](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java), [BlockStorage](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java), etc. +[PlayerProfile](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java), [BlockStorage](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java), etc. We also want to be generally more efficient in the way we save and load data. Today, we load way more than is required. @@ -56,13 +56,13 @@ as possible. There is a new interface called [`Storage`](TBD) which is what all storage backends will implement. This will have methods for loading and saving things like -[`PlayerProfile`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java) and [`BlockStorage`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). +[`PlayerProfile`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java) and [`BlockStorage`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). Then, backends will implement these (e.g. [`LegacyStorageBackend`](TBD) (today's YAML situation)) in order to support these functions. Not all storage backends are required support each data type. -e.g. SQL may not support [`BlockStorage`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). +e.g. SQL may not support [`BlockStorage`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). ## Addons @@ -86,29 +86,29 @@ Phases do not (and very likely will not) be done within a single PR. They will a The current plan looks like this: -* Phase 1 - Implement legacy data backend for [`PlayerProfile`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java). +* Phase 1 - Implement legacy data backend for [`PlayerProfile`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java). * We want to load player data using the new storage layer with the current data system. * We'll want to monitor for any possible issues and generally refine how this system should look -* Phase 2 - Implement new experimental binary backend for [`PlayerProfile`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java). +* Phase 2 - Implement new experimental binary backend for [`PlayerProfile`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java). * Create a new backend for binary storage * Implement in an experimental capacity and allow users to opt-in * Provide a warning that this is **experimental** and there will be bugs. * Implement new metric for storage backend being used -* Phase 3 - Mark the new backend as stable for [`PlayerProfile`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java). +* Phase 3 - Mark the new backend as stable for [`PlayerProfile`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java). * Mark it as stable and remove the warnings once we're sure things are working correctly * Create a migration path for users currently using "legacy". * Enable by default for new servers -* Phase 4 - Move [`BlockStorage`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java) to new storage layer. +* Phase 4 - Move [`BlockStorage`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java) to new storage layer. * The big one! We're gonna tackle adding this to BlockStorage. This will probably be a large change and we'll want to be as careful as possible here. * Implement `legacy` and `binary` as experimental storage backends for BlockStorage and allow users to opt-in * Provide a warning that this is **experimental** and there will be bugs. -* Phase 5 - Mark the new storage layer as stable for [`BlockStorage`](https://github.com/Slimefun/Slimefun4/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). +* Phase 5 - Mark the new storage layer as stable for [`BlockStorage`](https://github.com/Slimefun5/Slimefun5/blob/bbfb9734b9f549d7e82291eff041f9b666a61b63/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java). * Mark it as stable and remove the warnings once we're sure things are working correctly * Ensure migration path works here too. @@ -121,7 +121,7 @@ The current plan looks like this: ## State of work * Phase 1: In progress - * https://github.com/Slimefun/Slimefun4/pull/4065 + * https://github.com/Slimefun5/Slimefun5/pull/4065 * Phase 2: Not started * Phase 3: Not started * Phase 4: Not started diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..d9b00a66b7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +paperApiVersion=26.1.2.build.+ +shadowVersion=9.3.2 +githubGradleVersion=1.8.2.1 +runPaperVersion=3.0.2 + +slimefunAddons=Slimefun5/ExtraGear,Slimefun5/LuckyBlocks,Slimefun5/ChestTerminal,Slimefun5/SlimefunAdvancements,Slimefun5/ExoticGarden,Slimefun5/MissileWarfare,Slimefun5/LiteXpansion,Slimefun5/FluffyMachines,Slimefun5/InfinityExpansion,Slimefun5/DynaTech,Slimefun5/SensibleToolbox,Slimefun5/Galactifun,Slimefun5/SlimeTinker diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..a4b76b9530 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..37f78a6af8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..f3b75f3b0d --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..9d21a21834 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugins/Slimefun/Items.yml b/plugins/Slimefun/Items.yml new file mode 100644 index 0000000000..63875e466c --- /dev/null +++ b/plugins/Slimefun/Items.yml @@ -0,0 +1,3809 @@ +GRANDMAS_WALKING_STICK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GRANDPAS_WALKING_STICK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PORTABLE_CRAFTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FORTUNE_COOKIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DIET_COOKIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +OUTPUT_CHEST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_CRAFTING_TABLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PORTABLE_DUSTBIN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BEEF_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +PORK_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +CHICKEN_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +MUTTON_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +RABBIT_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +FISH_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + saturation-level: 6 +KELP_COOKIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GRIND_STONE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ARMOR_FORGE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORE_CRUSHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + double-ores: true +COMPRESSOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGIC_LUMP_1: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGIC_LUMP_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGIC_LUMP_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_LUMP_1: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_LUMP_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_LUMP_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGIC_EYE_OF_ENDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGIC_SUGAR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MONSTER_JERKY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SWORD_OF_BEHEADING: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + chance: + CREEPER: 40 + PLAYER: 70 + PIGLIN: 40 + SKELETON: 40 + WITHER_SKELETON: 25 + ZOMBIE: 40 +MAGICAL_BOOK_COVER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGICAL_GLASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BASIC_CIRCUIT_BOARD: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + drop-from-golems: true + golem-drop-chance: 75 +ADVANCED_CIRCUIT_BOARD: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_PAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + chance: + IRON_NUGGET: 5 + SIFTED_ORE: 35 + CLAY: 20 + FLINT: 40 +NETHER_GOLD_PAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + chance: + QUARTZ: 50 + NETHER_WART: 10 + BLAZE_POWDER: 8 + GOLD_NUGGET: 25 + GLOWSTONE_DUST: 5 + GHAST_TEAR: 2 +SIFTED_ORE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAKESHIFT_SMELTERY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SMELTERY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + fire-breaking-chance: 34 +IGNITION_CHAMBER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PRESSURE_CHAMBER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BATTERY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GLOWSTONE_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GLOWSTONE_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GLOWSTONE_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GLOWSTONE_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CACTUS_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CACTUS_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CACTUS_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CACTUS_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HARDENED_METAL_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STEEL_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BRONZE_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DURALUMIN_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BILLON_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BRASS_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ALUMINUM_BRASS_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ALUMINUM_BRONZE_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CORINTHIAN_BRONZE_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLDER_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SYNTHETIC_SAPPHIRE: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SYNTHETIC_DIAMOND: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAW_CARBONADO: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NICKEL_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COBALT_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBONADO: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERROSILICON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +IRON_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COPPER_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TIN_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SILVER_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LEAD_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ALUMINUM_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ZINC_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGNESIUM_DUST: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COPPER_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TIN_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SILVER_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LEAD_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ALUMINUM_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ZINC_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGNESIUM_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SULFATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WHEAT_FLOUR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STEEL_PLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COMPRESSED_CARBON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBON_CHUNK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STEEL_THRUSTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +POWER_CRYSTAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DURALUMIN_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLDER_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BILLON_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STEEL_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBONADO_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ARMORED_JETPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PARACHUTE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HOLOGRAM_PROJECTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHAIN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HOOK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GRAPPLING_HOOK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + despawn-seconds: 60 + consume-on-use: true +MAGIC_WORKBENCH: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STAFF_ELEMENTAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STAFF_ELEMENTAL_WIND: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + power: 4 +STAFF_ELEMENTAL_WATER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STAFF_ELEMENTAL_FIRE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: false +DURALUMIN_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '1': + enabled: true + item: MAGIC_EYE_OF_ENDER + '0': + enabled: true + item: PORTABLE_CRAFTER + '3': + enabled: true + item: GRAPPLING_HOOK + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true +SOLDER_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '0': + enabled: true + item: PORTABLE_CRAFTER + '1': + item: MAGIC_EYE_OF_ENDER + enabled: true + '3': + item: GRAPPLING_HOOK + enabled: true + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true +BILLON_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true + '3': + enabled: true + item: GRAPPLING_HOOK + '0': + enabled: true + item: PORTABLE_CRAFTER + '1': + item: MAGIC_EYE_OF_ENDER + enabled: true +STEEL_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '2': + enabled: true + item: STAFF_ELEMENTAL_WIND + '3': + item: GRAPPLING_HOOK + enabled: true + '0': + enabled: true + item: PORTABLE_CRAFTER + '1': + enabled: true + item: MAGIC_EYE_OF_ENDER +DAMASCUS_STEEL_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true + '3': + enabled: true + item: GRAPPLING_HOOK + '0': + item: PORTABLE_CRAFTER + enabled: true + '1': + item: MAGIC_EYE_OF_ENDER + enabled: true +REINFORCED_ALLOY_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '3': + item: GRAPPLING_HOOK + enabled: true + '0': + item: PORTABLE_CRAFTER + enabled: true + '1': + enabled: true + item: MAGIC_EYE_OF_ENDER + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true +CARBONADO_MULTI_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + mode: + '5': + enabled: true + item: NETHER_GOLD_PAN + '1': + item: MAGIC_EYE_OF_ENDER + enabled: true + '0': + enabled: true + item: PORTABLE_CRAFTER + '4': + enabled: true + item: GOLD_PAN + '3': + item: GRAPPLING_HOOK + enabled: true + '2': + item: STAFF_ELEMENTAL_WIND + enabled: true +ORE_WASHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_24K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_22K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_20K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_18K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_16K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_14K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_12K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_10K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_8K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_6K: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_4K: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STONE_CHUNK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SILICON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLAR_PANEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLAR_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + charge-amount: 0.1 +LAVA_CRYSTAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STAFF_ELEMENTAL_STORM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGICAL_ZOMBIE_PILLS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SMELTERS_PICKAXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COMMON_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANVIL_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_ANVIL_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MINER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_MINER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FARMER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_FARMER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HUNTER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_HUNTER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LAVA_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_LAVA_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WATER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_WATER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANGEL_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_ANGEL_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FIRE_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_FIRE_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGICIAN_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + allow-enchantments: + minecraft: + multishot: + level: + '1': true + frost_walker: + level: + '2': true + '1': true + binding_curse: + level: + '1': true + lure: + level: + '3': true + '1': true + '2': true + projectile_protection: + level: + '4': true + '3': true + '2': true + '1': true + sharpness: + level: + '5': true + '4': true + '1': true + '3': true + '2': true + luck_of_the_sea: + level: + '1': true + '2': true + '3': true + fortune: + level: + '1': true + '2': true + '3': true + protection: + level: + '2': true + '3': true + '4': true + '1': true + silk_touch: + level: + '1': true + smite: + level: + '5': true + '1': true + '2': true + '3': true + '4': true + respiration: + level: + '3': true + '2': true + '1': true + breach: + level: + '4': true + '2': true + '3': true + '1': true + lunge: + level: + '2': true + '3': true + '1': true + channeling: + level: + '1': true + looting: + level: + '2': true + '1': true + '3': true + sweeping_edge: + level: + '3': true + '1': true + '2': true + fire_aspect: + level: + '1': true + '2': true + quick_charge: + level: + '2': true + '1': true + '3': true + punch: + level: + '1': true + '2': true + fire_protection: + level: + '1': true + '2': true + '3': true + '4': true + infinity: + level: + '1': true + bane_of_arthropods: + level: + '4': true + '5': true + '2': true + '3': true + '1': true + unbreaking: + level: + '1': true + '2': true + '3': true + knockback: + level: + '2': true + '1': true + feather_falling: + level: + '1': true + '4': true + '2': true + '3': true + mending: + level: + '1': true + vanishing_curse: + level: + '1': true + soul_speed: + level: + '2': true + '3': true + '1': true + riptide: + level: + '3': true + '2': true + '1': true + depth_strider: + level: + '3': true + '2': true + '1': true + density: + level: + '3': true + '4': true + '1': true + '2': true + '5': true + loyalty: + level: + '3': true + '2': true + '1': true + wind_burst: + level: + '3': true + '2': true + '1': true + power: + level: + '1': true + '2': true + '3': true + '4': true + '5': true + thorns: + level: + '3': true + '2': true + '1': true + blast_protection: + level: + '3': true + '4': true + '1': true + '2': true + impaling: + level: + '4': true + '5': true + '2': true + '3': true + '1': true + efficiency: + level: + '1': true + '2': true + '3': true + '4': true + '5': true + flame: + level: + '1': true + piercing: + level: + '1': true + '4': true + '3': true + '2': true + swift_sneak: + level: + '3': true + '1': true + '2': true + aqua_affinity: + level: + '1': true + allow-enchantment-books: false +ENDER_MAGICIAN_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TRAVELLER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_TRAVELLER_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WARRIOR_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_WARRIOR_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +KNIGHT_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_KNIGHT_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CAVEMAN_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_CAVEMAN_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WISE_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_WISE_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GILDED_IRON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SYNTHETIC_EMERALD: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHAIN_HELMET: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHAIN_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHAIN_LEGGINGS: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHAIN_BOOTS: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WHIRLWIND_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_WHIRLWIND_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WIZARD_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENDER_WIZARD_TALISMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LUMBER_AXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SALT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HEAVY_CREAM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHEESE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BUTTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GILDED_IRON_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GILDED_IRON_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GILDED_IRON_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GILDED_IRON_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_CLOTH: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SCUBA_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HAZMAT_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HAZMAT_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RUBBER_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CRUSHED_ORE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PULVERIZED_ORE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PURE_ORE_CLUSTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TINY_URANIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SMALL_URANIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +URANIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REDSTONE_ALLOY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_12K_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_12K_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_12K_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLD_12K_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CLOTH: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAG: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BANDAGE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SPLINT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +VITAMINS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MEDICINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NIGHT_VISION_GOGGLES: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PICKAXE_OF_CONTAINMENT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TABLE_SAW: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_STEEL_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_STEEL_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_STEEL_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SLIME_STEEL_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BLADE_OF_VAMPIRES: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + chance: 45 +GOLD_24K_BLOCK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COMPOSTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FARMER_SHOES: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +EXPLOSIVE_PICKAXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + call-explosion-event: false + damage-on-use: true +EXPLOSIVE_SHOVEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + damage-on-use: true + call-explosion-event: false +AUTOMATED_PANNING_MACHINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +INDUSTRIAL_MINER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + can-mine-deepslate-ores: true + can-mine-ancient-debris: false +ADVANCED_INDUSTRIAL_MINER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + can-mine-deepslate-ores: true + can-mine-ancient-debris: false +BOOTS_OF_THE_STOMPER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PICKAXE_OF_THE_SEEKER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + max-range: 5 +SMALL_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MEDIUM_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LARGE_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WOVEN_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CRUCIBLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + allow-water-in-nether: false +GILDED_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RADIANT_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RESTORED_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: true + allow-enchanting: true + allow-disenchanting: true +MAGNET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +INFUSED_MAGNET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + pickup-radius: 6.0 +COBALT_PICKAXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NECROTIC_SKULL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ESSENCE_OF_AFTERLIFE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SYNTHETIC_SHULKER_SHELL: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BOUND_BACKPACK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DURALUMIN_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLDER_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BILLON_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STEEL_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DAMASCUS_STEEL_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_ALLOY_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBONADO_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ARMORED_JETBOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SEISMIC_AXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PICKAXE_OF_VEIN_MINING: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + max-blocks: 16 +CLIMBING_PICK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + launch-amounts: + WHITE_CONCRETE_POWDER: 0.6 + YELLOW_CONCRETE_POWDER: 0.6 + BLUE_TERRACOTTA: 1.0 + BLUE_ICE: 1.0 + CYAN_TERRACOTTA: 1.0 + CLAY: 0.6 + BLACKSTONE: 1.0 + LIGHT_BLUE_TERRACOTTA: 1.0 + BASALT: 1.0 + PURPLE_TERRACOTTA: 1.0 + GRANITE: 1.0 + FROSTED_ICE: 1.0 + SUSPICIOUS_SAND: 0.6 + BROWN_CONCRETE_POWDER: 0.6 + LIME_CONCRETE_POWDER: 0.6 + STONE: 1.0 + ORANGE_TERRACOTTA: 1.0 + GRAVEL: 0.6 + YELLOW_TERRACOTTA: 1.0 + NETHERRACK: 1.0 + TERRACOTTA: 1.0 + PACKED_ICE: 1.0 + GRAY_TERRACOTTA: 1.0 + ORANGE_CONCRETE_POWDER: 0.6 + RED_CONCRETE_POWDER: 0.6 + CYAN_CONCRETE_POWDER: 0.6 + RED_TERRACOTTA: 1.0 + GREEN_CONCRETE_POWDER: 0.6 + ANDESITE: 1.0 + LIME_TERRACOTTA: 1.0 + ICE: 1.0 + LIGHT_GRAY_TERRACOTTA: 1.0 + BLUE_CONCRETE_POWDER: 0.6 + GRAY_CONCRETE_POWDER: 0.6 + LIGHT_BLUE_CONCRETE_POWDER: 0.6 + BLACK_CONCRETE_POWDER: 0.6 + DEEPSLATE: 1.0 + LIGHT_GRAY_CONCRETE_POWDER: 0.6 + PINK_TERRACOTTA: 1.0 + PINK_CONCRETE_POWDER: 0.6 + DIORITE: 1.0 + WHITE_TERRACOTTA: 1.0 + TUFF: 1.0 + DRIPSTONE_BLOCK: 1.0 + SAND: 0.6 + GREEN_TERRACOTTA: 1.0 + SMOOTH_BASALT: 1.0 + MAGENTA_CONCRETE_POWDER: 0.6 + RED_SAND: 0.6 + CALCITE: 1.0 + PURPLE_CONCRETE_POWDER: 0.6 + BROWN_TERRACOTTA: 1.0 + MAGENTA_TERRACOTTA: 1.0 + BLACK_TERRACOTTA: 1.0 + dual-wielding: true + damage-on-use: true +SOULBOUND_SWORD: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_TRIDENT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_BOW: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_PICKAXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_AXE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_SHOVEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_HOE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_CHESTPLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +JUICER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +APPLE_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARROT_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MELON_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PUMPKIN_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SWEET_BERRY_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GOLDEN_APPLE_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENCHANTED_GOLDEN_APPLE: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BROKEN_SPAWNER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_SPAWNER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + allow-spawn-eggs: true +ENHANCED_FURNACE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_4: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_5: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_6: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_7: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_8: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_9: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_10: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_FURNACE_11: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_FURNACE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBONADO_EDGED_FURNACE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRO_MAGNET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_MOTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HEATING_COIL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COPPER_WIRE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BLOCK_PLACER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + unplaceable-blocks: + - BEDROCK + - END_PORTAL + - STRUCTURE_VOID + - REPEATING_COMMAND_BLOCK + - END_GATEWAY + - CHAIN_COMMAND_BLOCK + - STRUCTURE_BLOCK + - COMMAND_BLOCK + - END_PORTAL_FRAME + - BARRIER + - NETHER_PORTAL + - JIGSAW +SCROLL_OF_DIMENSIONAL_TELEPOSITION: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + radius: 10 +EXPLOSIVE_BOW: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + explosion-range: 3 +ICY_BOW: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TOME_OF_KNOWLEDGE_SHARING: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FLASK_OF_KNOWLEDGE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BIRTHDAY_CAKE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_MILK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_CHOCOLATE_MILK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_EGG_NOG: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_APPLE_CIDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_COOKIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_FRUIT_CAKE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_APPLE_PIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_HOT_CHOCOLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_CAKE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_CARAMEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_CARAMEL_APPLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_CHOCOLATE_APPLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CHRISTMAS_PRESENT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARROT_PIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +EASTER_APPLE_PIE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +EASTER_EGG: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REINFORCED_PLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HARDENED_GLASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COOLING_UNIT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COOLER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WITHER_PROOF_OBSIDIAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_PEDESTAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_ALTAR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + step-delay: 8 +ENERGY_REGULATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENERGY_CONNECTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +DUCT_TAPE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SMALL_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MEDIUM_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BIG_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LARGE_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBONADO_EDGED_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENERGIZED_CAPACITOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOLAR_GENERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + other-dimensions-use-night-energy: false +SOLAR_GENERATOR_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + other-dimensions-use-night-energy: false +SOLAR_GENERATOR_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + other-dimensions-use-night-energy: false +SOLAR_GENERATOR_4: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + other-dimensions-use-night-energy: false +CHARGING_BENCH: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_FURNACE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_FURNACE_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_FURNACE_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_GOLD_PAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + override-output-limit: false +ELECTRIC_GOLD_PAN_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + override-output-limit: false +ELECTRIC_GOLD_PAN_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + override-output-limit: false +ELECTRIC_DUST_WASHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_DUST_WASHER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_DUST_WASHER_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_INGOT_FACTORY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_INGOT_FACTORY_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_INGOT_FACTORY_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIFIED_CRUCIBLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIFIED_CRUCIBLE_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIFIED_CRUCIBLE_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_ORE_GRINDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_ORE_GRINDER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_ORE_GRINDER_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HEATED_PRESSURE_CHAMBER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +HEATED_PRESSURE_CHAMBER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_INGOT_PULVERIZER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COAL_GENERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COAL_GENERATOR_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BIO_REACTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +AUTO_DRIER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +AUTO_BREWER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_PRESS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_PRESS_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGNESIUM_SALT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +MAGNESIUM_GENERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +AUTO_ENCHANTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-ignored-lores: false + ignored-lores: + - '&7- &cCan''t be used in §5Auto Enchanter' + enchant-level-limit: 10 + max-enchants: 10 + override-existing-enchants-lvl: false + use-max-enchants: false + use-enchant-level-limit: false +AUTO_ENCHANTER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-max-enchants: false + max-enchants: 10 + use-enchant-level-limit: false + override-existing-enchants-lvl: false + use-ignored-lores: false + enchant-level-limit: 10 + ignored-lores: + - '&7- &cCan''t be used in §5Auto Enchanter §7- §eII' +AUTO_DISENCHANTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-enchant-level-limit: false + max-enchants: 10 + ignored-lores: + - '&7- &cCan''t be used in §5Auto Disenchanter' + use-ignored-lores: false + use-max-enchants: false + enchant-level-limit: 10 +AUTO_DISENCHANTER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + enchant-level-limit: 10 + use-enchant-level-limit: false + ignored-lores: + - '&7- &cCan''t be used in §5Auto Disenchanter §7- §eII' + use-max-enchants: false + use-ignored-lores: false + max-enchants: 10 +AUTO_ANVIL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +AUTO_ANVIL_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BOOK_BINDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + bypass-vanilla-max-level: false + custom-max-level: 15 + has-custom-max-level: false +MULTIMETER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PLASTIC_SHEET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANDROID_MEMORY_CORE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TRANSMITTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TRANSMITTER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TRANSMITTER_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TRANSMITTER_4: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_CONTROL_PANEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_MARKER_TOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_EMERGENCY_TRANSMITTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANDROID_INTERFACE_ITEMS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANDROID_INTERFACE_FUEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_MINER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + reduced-block-updates: true + trigger-event-for-generators: false +PROGRAMMABLE_ANDROID_FARMER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_WOODCUTTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_FISHERMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_BUTCHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_2_FISHERMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_2_BUTCHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_2_FARMER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_3_FISHERMAN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PROGRAMMABLE_ANDROID_3_BUTCHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BLANK_RUNE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_AIR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_EARTH: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_FIRE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_WATER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_ENDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_LIGHTNING: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_RAINBOW: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_SOULBOUND: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_ENCHANTMENT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +INFERNAL_BONEMEAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELYTRA_SCALE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELYTRA: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +INFUSED_ELYTRA: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +SOULBOUND_ELYTRA: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TRIDENT: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TOTEM_OF_UNDYING: + enabled: true + can-be-used-in-workbenches: true + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_WOOL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_PANE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CLAY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CONCRETE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLAZED_TERRACOTTA: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_WOOL_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_PANE_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CLAY_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CONCRETE_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLAZED_TERRACOTTA_XMAS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_WOOL_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_PANE_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CLAY_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CONCRETE_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLAZED_TERRACOTTA_VALENTINE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_WOOL_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLASS_PANE_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CLAY_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_CONCRETE_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_GLAZED_TERRACOTTA_HALLOWEEN: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WITHER_PROOF_GLASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_GEO_SCANNER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PORTABLE_GEO_SCANNER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +OIL_PUMP: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GEO_MINER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BUCKET_OF_OIL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BUCKET_OF_FUEL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NETHER_ICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REFINERY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LAVA_GENERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +LAVA_GENERATOR_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +COMBUSTION_REACTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TELEPORTER_PYLON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_TELEPORTATION_MATRIX: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PORTABLE_TELEPORTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + teleportation-cost: 10 +GPS_ACTIVATION_DEVICE_SHARED: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +GPS_ACTIVATION_DEVICE_PERSONAL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +INFUSED_HOPPER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + radius: 3.5 + silent: false + toggleable-with-redstone: false +BLISTERING_INGOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BLISTERING_INGOT_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BLISTERING_INGOT_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENRICHED_NETHER_ICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELEVATOR_PLATE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FOOD_FABRICATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FOOD_FABRICATOR_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_WHEAT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_CARROT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_POTATO: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_SEEDS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_BEETROOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_MELON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_APPLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_SWEET_BERRIES: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_KELP: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_COCOA: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ORGANIC_FOOD_SEAGRASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +AUTO_BREEDER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANIMAL_GROWTH_ACCELERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TREE_GROWTH_ACCELERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +XP_COLLECTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FOOD_COMPOSTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FOOD_COMPOSTER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_WHEAT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_CARROT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_POTATO: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_SEEDS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_BEETROOT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_MELON: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_APPLE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_SWEET_BERRIES: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_KELP: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_COCOA: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FERTILIZER_SEAGRASS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CROP_GROWTH_ACCELERATOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CROP_GROWTH_ACCELERATOR_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FREEZER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-vanilla-ratios: false +FREEZER_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-vanilla-ratios: false +FREEZER_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + use-vanilla-ratios: false +REACTOR_COLLANT_CELL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NETHER_ICE_COOLANT_CELL: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NEPTUNIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PLUTONIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BOOSTED_URANIUM: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NUCLEAR_REACTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +NETHERSTAR_REACTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_MOTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_MANAGER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_NODE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_NODE_INPUT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_NODE_OUTPUT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARGO_NODE_OUTPUT_ADVANCED: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +REACTOR_ACCESS_PORT: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +FLUID_PUMP: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TRASH_CAN_BLOCK: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBON_PRESS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBON_PRESS_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CARBON_PRESS_3: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_SMELTERY: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELECTRIC_SMELTERY_2: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +IRON_GOLEM_ASSEMBLER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +WITHER_ASSEMBLER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +TAPE_MEASURE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BEE_HELMET: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BEE_WINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BEE_LEGGINGS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +BEE_BOOTS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ANCIENT_RUNE_VILLAGERS: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +STRANGE_NETHER_GOO: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + barter-chance: 7 +GLOW_BERRY_JUICE: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ELYTRA_CAP: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +RAINBOW_LEATHER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +CRAFTING_MOTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +VANILLA_AUTO_CRAFTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ENHANCED_AUTO_CRAFTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +ARMOR_AUTO_CRAFTER: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true +PRODUCE_COLLECTOR: + enabled: true + can-be-used-in-workbenches: false + hide-in-guide: false + allow-enchanting: true + allow-disenchanting: true + range: 2 diff --git a/plugins/Slimefun/Researches.yml b/plugins/Slimefun/Researches.yml new file mode 100644 index 0000000000..1182344e99 --- /dev/null +++ b/plugins/Slimefun/Researches.yml @@ -0,0 +1,776 @@ +enable-researching: true +slimefun: + walking_sticks: + cost: 1 + enabled: true + portable_crafter: + cost: 1 + enabled: true + fortune_cookie: + cost: 1 + enabled: true + portable_dustbin: + cost: 2 + enabled: true + meat_jerky: + cost: 2 + enabled: true + armor_forge: + cost: 2 + enabled: true + glowstone_armor: + cost: 3 + enabled: true + lumps: + cost: 3 + enabled: true + ender_backpack: + cost: 4 + enabled: true + ender_armor: + cost: 4 + enabled: true + magic_eye_of_ender: + cost: 4 + enabled: true + magic_sugar: + cost: 4 + enabled: true + monster_jerky: + cost: 5 + enabled: true + slime_armor: + cost: 5 + enabled: true + sword_of_beheading: + cost: 6 + enabled: true + basic_circuit_board: + cost: 8 + enabled: true + advanced_circuit_board: + cost: 9 + enabled: true + smeltery: + cost: 10 + enabled: true + steel: + cost: 11 + enabled: true + misc_power_items: + cost: 12 + enabled: true + battery: + cost: 10 + enabled: true + steel_plate: + cost: 14 + enabled: true + steel_thruster: + cost: 14 + enabled: true + parachute: + cost: 15 + enabled: true + grappling_hook: + cost: 15 + enabled: true + jetpacks: + cost: 22 + enabled: true + multitools: + cost: 18 + enabled: true + solar_panel_and_helmet: + cost: 17 + enabled: true + elemental_staff: + cost: 17 + enabled: true + grind_stone: + cost: 4 + enabled: true + cactus_armor: + cost: 5 + enabled: true + gold_pan: + cost: 5 + enabled: true + magical_book_cover: + cost: 5 + enabled: true + slimefun_metals: + cost: 6 + enabled: true + ore_crusher: + cost: 6 + enabled: true + bronze: + cost: 8 + enabled: true + alloys: + cost: 12 + enabled: true + compressor_and_carbon: + cost: 9 + enabled: true + gilded_iron_armor: + cost: 16 + enabled: true + synthetic_diamond: + cost: 10 + enabled: true + pressure_chamber: + cost: 14 + enabled: true + synthetic_sapphire: + cost: 16 + enabled: true + damascus_steel: + cost: 17 + enabled: true + damascus_steel_armor: + cost: 18 + enabled: true + reinforced_alloy: + cost: 22 + enabled: true + carbonado: + cost: 26 + enabled: true + magic_workbench: + cost: 12 + enabled: true + wind_staff: + cost: 17 + enabled: true + reinforced_armor: + cost: 26 + enabled: true + ore_washer: + cost: 5 + enabled: true + gold_carats: + cost: 7 + enabled: true + silicon: + cost: 12 + enabled: true + fire_staff: + cost: 2 + enabled: true + smelters_pickaxe: + cost: 17 + enabled: true + common_talisman: + cost: 14 + enabled: true + anvil_talisman: + cost: 18 + enabled: true + miner_talisman: + cost: 18 + enabled: true + hunter_talisman: + cost: 18 + enabled: true + lava_talisman: + cost: 18 + enabled: true + water_talisman: + cost: 18 + enabled: true + angel_talisman: + cost: 18 + enabled: true + fire_talisman: + cost: 18 + enabled: true + lava_crystal: + cost: 14 + enabled: true + magician_talisman: + cost: 20 + enabled: true + traveller_talisman: + cost: 20 + enabled: true + warrior_talisman: + cost: 20 + enabled: true + knight_talisman: + cost: 20 + enabled: true + gilded_iron: + cost: 11 + enabled: true + synthetic_emerald: + cost: 17 + enabled: true + chainmail_armor: + cost: 8 + enabled: true + whirlwind_talisman: + cost: 19 + enabled: true + wizard_talisman: + cost: 22 + enabled: true + lumber_axe: + cost: 21 + enabled: true + hazmat_suit: + cost: 21 + enabled: true + uranium: + cost: 30 + enabled: true + crushed_ore: + cost: 25 + enabled: true + redstone_alloy: + cost: 16 + enabled: true + carbonado_tools: + cost: 24 + enabled: true + first_aid: + cost: 2 + enabled: true + gold_armor: + cost: 13 + enabled: true + night_vision_googles: + cost: 10 + enabled: true + pickaxe_of_containment: + cost: 14 + enabled: true + table_saw: + cost: 4 + enabled: true + slime_steel_armor: + cost: 27 + enabled: true + blade_of_vampires: + cost: 26 + enabled: true + water_staff: + cost: 8 + enabled: true + 24k_gold_block: + cost: 19 + enabled: true + composter: + cost: 3 + enabled: true + farmer_shoes: + cost: 4 + enabled: true + explosive_tools: + cost: 30 + enabled: true + automated_panning_machine: + cost: 17 + enabled: true + boots_of_the_stomper: + cost: 19 + enabled: true + pickaxe_of_the_seeker: + cost: 19 + enabled: true + backpacks: + cost: 15 + enabled: true + woven_backpack: + cost: 19 + enabled: true + crucible: + cost: 13 + enabled: true + gilded_backpack: + cost: 22 + enabled: true + armored_jetpack: + cost: 27 + enabled: true + ender_talismans: + cost: 28 + enabled: true + nickel_and_cobalt: + cost: 10 + enabled: true + magnet: + cost: 16 + enabled: true + infused_magnet: + cost: 18 + enabled: true + cobalt_pickaxe: + cost: 14 + enabled: true + essence_of_afterlife: + cost: 19 + enabled: true + bound_backpack: + cost: 22 + enabled: true + jetboots: + cost: 25 + enabled: true + armored_jetboots: + cost: 27 + enabled: true + seismic_axe: + cost: 29 + enabled: true + pickaxe_of_vein_mining: + cost: 29 + enabled: true + bound_weapons: + cost: 29 + enabled: true + bound_tools: + cost: 29 + enabled: true + bound_armor: + cost: 29 + enabled: true + juicer: + cost: 29 + enabled: true + repaired_spawner: + cost: 15 + enabled: true + enhanced_furnace: + cost: 7 + enabled: true + more_enhanced_furnaces: + cost: 18 + enabled: true + high_tier_enhanced_furnaces: + cost: 29 + enabled: true + reinforced_furnace: + cost: 32 + enabled: true + carbonado_furnace: + cost: 35 + enabled: true + electric_motor: + cost: 32 + enabled: true + block_placer: + cost: 17 + enabled: true + scroll_of_dimensional_teleposition: + cost: 38 + enabled: true + special_bows: + cost: 22 + enabled: true + tome_of_knowledge_sharing: + cost: 30 + enabled: true + flask_of_knowledge: + cost: 13 + enabled: true + hardened_glass: + cost: 15 + enabled: true + golden_apple_juice: + cost: 24 + enabled: true + cooler: + cost: 24 + enabled: true + ancient_altar: + cost: 15 + enabled: true + wither_proof_obsidian: + cost: 21 + enabled: true + ancient_runes: + cost: 15 + enabled: true + special_runes: + cost: 18 + enabled: true + infernal_bonemeal: + cost: 12 + enabled: true + rainbow_blocks: + cost: 24 + enabled: true + infused_hopper: + cost: 22 + enabled: true + wither_proof_glass: + cost: 20 + enabled: true + duct_tape: + cost: 14 + enabled: true + plastic_sheet: + cost: 25 + enabled: true + android_memory_core: + cost: 28 + enabled: true + oil: + cost: 30 + enabled: true + fuel: + cost: 30 + enabled: true + hologram_projector: + cost: 36 + enabled: true + capacitors: + cost: 25 + enabled: true + high_tier_capacitors: + cost: 32 + enabled: true + solar_generators: + cost: 14 + enabled: true + electric_furnaces: + cost: 15 + enabled: true + electric_ore_grinding: + cost: 20 + enabled: true + heated_pressure_chamber: + cost: 22 + enabled: true + coal_generator: + cost: 14 + enabled: true + bio_reactor: + cost: 18 + enabled: true + auto_enchanting: + cost: 24 + enabled: true + auto_anvil: + cost: 34 + enabled: true + multimeter: + cost: 10 + enabled: true + gps_setup: + cost: 28 + enabled: true + gps_emergency_transmitter: + cost: 30 + enabled: true + programmable_androids: + cost: 50 + enabled: true + android_interfaces: + cost: 26 + enabled: true + geo_scanner: + cost: 30 + enabled: true + combustion_reactor: + cost: 38 + enabled: true + teleporter: + cost: 42 + enabled: true + teleporter_activation_plates: + cost: 36 + enabled: true + better_solar_generators: + cost: 28 + enabled: true + better_gps_transmitters: + cost: 36 + enabled: true + elevator: + cost: 28 + enabled: true + energized_solar_generator: + cost: 44 + enabled: true + energized_gps_transmitter: + cost: 44 + enabled: true + energy_regulator: + cost: 6 + enabled: true + butcher_androids: + cost: 32 + enabled: true + organic_food: + cost: 25 + enabled: true + auto_breeder: + cost: 25 + enabled: true + advanced_android: + cost: 60 + enabled: true + advanced_butcher_android: + cost: 30 + enabled: true + advanced_fisherman_android: + cost: 30 + enabled: true + animal_growth_accelerator: + cost: 32 + enabled: true + xp_collector: + cost: 36 + enabled: true + organic_fertilizer: + cost: 36 + enabled: true + crop_growth_accelerator: + cost: 40 + enabled: true + better_crop_growth_accelerator: + cost: 44 + enabled: true + reactor_essentials: + cost: 36 + enabled: true + nuclear_reactor: + cost: 48 + enabled: true + freezer: + cost: 20 + enabled: true + cargo_basics: + cost: 30 + enabled: true + cargo_nodes: + cost: 30 + enabled: true + electric_ingot_machines: + cost: 18 + enabled: true + medium_tier_electric_ingot_machines: + cost: 25 + enabled: true + high_tier_electric_ingot_machines: + cost: 32 + enabled: true + better_food_fabricator: + cost: 28 + enabled: true + reactor_access_port: + cost: 18 + enabled: true + fluid_pump: + cost: 28 + enabled: true + better_freezer: + cost: 29 + enabled: true + boosted_uranium: + cost: 30 + enabled: true + trash_can: + cost: 8 + enabled: true + advanced_output_node: + cost: 24 + enabled: true + carbon_press: + cost: 28 + enabled: true + electric_smeltery: + cost: 28 + enabled: true + better_electric_furnace: + cost: 20 + enabled: true + better_carbon_press: + cost: 26 + enabled: true + empowered_android: + cost: 60 + enabled: true + empowered_butcher_android: + cost: 30 + enabled: true + empowered_fisherman_android: + cost: 30 + enabled: true + high_tier_carbon_press: + cost: 32 + enabled: true + wither_assembler: + cost: 35 + enabled: true + better_heated_pressure_chamber: + cost: 20 + enabled: true + elytra: + cost: 20 + enabled: true + special_elytras: + cost: 30 + enabled: true + electric_crucible: + cost: 26 + enabled: true + better_electric_crucibles: + cost: 30 + enabled: true + advanced_electric_smeltery: + cost: 28 + enabled: true + advanced_farmer_android: + cost: 30 + enabled: true + lava_generator: + cost: 16 + enabled: true + nether_ice: + cost: 45 + enabled: true + nether_star_reactor: + cost: 60 + enabled: true + blistering_ingots: + cost: 38 + enabled: true + automatic_ignition_chamber: + cost: 12 + enabled: true + output_chest: + cost: 20 + enabled: true + copper_wire: + cost: 15 + enabled: true + radiant_backpack: + cost: 25 + enabled: true + auto_drier: + cost: 15 + enabled: true + diet_cookie: + cost: 3 + enabled: true + storm_staff: + cost: 30 + enabled: true + soulbound_rune: + cost: 60 + enabled: true + geo_miner: + cost: 24 + enabled: true + lightning_rune: + cost: 24 + enabled: true + totem_of_undying: + cost: 36 + enabled: true + charging_bench: + cost: 8 + enabled: true + nether_gold_pan: + cost: 8 + enabled: true + electric_press: + cost: 16 + enabled: true + magnesium_generator: + cost: 20 + enabled: true + kelp_cookie: + cost: 4 + enabled: true + makeshift_smeltery: + cost: 6 + enabled: true + tree_growth_accelerator: + cost: 18 + enabled: true + industrial_miner: + cost: 28 + enabled: true + advanced_industrial_miner: + cost: 36 + enabled: true + magical_zombie_pills: + cost: 22 + enabled: true + auto_brewer: + cost: 30 + enabled: true + enchantment_rune: + cost: 24 + enabled: true + lead_clothing: + cost: 14 + enabled: true + tape_measure: + cost: 7 + enabled: true + iron_golem_assembler: + cost: 30 + enabled: true + shulker_shell: + cost: 30 + enabled: true + villager_rune: + cost: 26 + enabled: true + climbing_pick: + cost: 20 + enabled: true + even_higher_tier_capacitors: + cost: 40 + enabled: true + caveman_talisman: + cost: 20 + enabled: true + elytra_cap: + cost: 20 + enabled: true + energy_connectors: + cost: 12 + enabled: true + bee_armor: + cost: 24 + enabled: true + wise_talisman: + cost: 20 + enabled: true + book_binder: + cost: 26 + enabled: true + auto_crafting: + cost: 30 + enabled: true + produce_collector: + cost: 20 + enabled: true + improved_generators: + cost: 24 + enabled: true + ingredients_and_cheese: + cost: 5 + enabled: true + medium_tier_auto_enchanting: + cost: 48 + enabled: true + portable_teleporter: + cost: 42 + enabled: true + trident: + cost: 20 + enabled: true + farmer_talisman: + cost: 18 + enabled: true + rainbow_armor: + cost: 22 + enabled: true diff --git a/plugins/Slimefun/resources.yml b/plugins/Slimefun/resources.yml new file mode 100644 index 0000000000..3faa14f01e --- /dev/null +++ b/plugins/Slimefun/resources.yml @@ -0,0 +1,9 @@ +slimefun: + oil: + enabled: true + nether_ice: + enabled: true + uranium: + enabled: true + salt: + enabled: true diff --git a/plugins/Slimefun/world-settings/world.yml b/plugins/Slimefun/world-settings/world.yml new file mode 100644 index 0000000000..25663a3721 --- /dev/null +++ b/plugins/Slimefun/world-settings/world.yml @@ -0,0 +1,17 @@ +enabled: true +slimefun: + enabled: true + ANVIL_TALISMAN: true + ENDER_ANVIL_TALISMAN: true + ELECTRIC_FURNACE: true + ENERGY_CONNECTOR: true + STAFF_ELEMENTAL_WIND: true + SOULBOUND_ITEM_ENABLED: true + ITEM_GROUPS_TEST_ITEM: true + SEASONAL_ITEM: true + HELMET_FLEX: true + MOCK_URANIUM_TRUE_TRUE: true + MOCK_HAZMAT_SUIT_TRUE: true + MOCK_URANIUM_TRUE_FALSE: true + MOCK_HAZMAT_SUIT_FALSE: true + MOCK_URANIUM_FALSE_TRUE: true diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 65280d4459..0000000000 --- a/pom.xml +++ /dev/null @@ -1,540 +0,0 @@ - - - - 4.0.0 - com.github.slimefun - Slimefun - - - - 4.9-UNOFFICIAL - 2013 - jar - - - Slimefun is a Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server. - https://github.com/Slimefun/Slimefun4 - - - - UTF-8 - - - 16 - 16 - - 21 - 21 - - - 1.21.1 - https://hub.spigotmc.org/javadocs/spigot/ - - - Slimefun_Slimefun4 - slimefun - https://sonarcloud.io - DEBUG - target/site/jacoco/jacoco.xml - - - - - GitHub Issues - https://github.com/Slimefun/Slimefun4/issues - - - - - - GNU General Public License v3.0 - https://github.com/Slimefun/Slimefun4/blob/master/LICENSE - repo - - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - - - - paper-repo - https://repo.papermc.io/repository/maven-public/ - - - - jitpack.io - https://jitpack.io - - - - worldedit-repo - https://maven.enginehub.org/repo/ - - - - placeholderapi-repo - https://repo.extendedclip.com/content/repositories/placeholderapi - - - - mcmmo-repo - https://nexus.neetgames.com/repository/maven-public - - - - walshy-public - https://repo.walshy.dev/public - - - - codemc-repo - https://repo.codemc.io/repository/maven-public/ - - - - - - ${project.basedir}/src/main/java - - - ${project.basedir}/src/test/java - - - clean package - - - ${project.name} v${project.version} - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - - - - **/package-info.java - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - - attach-sources - - jar - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.2 - - - org.junit.jupiter:junit-jupiter - false - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 5.0.0.4389 - - - - - org.jacoco - jacoco-maven-plugin - 0.8.12 - - - - prepare - - - prepare-agent - - - - - report - test - - - report - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - - - - - io.github.bakedlibs.dough - io.github.thebusybiscuit.slimefun4.libraries.dough - - - io.papermc.lib - io.github.thebusybiscuit.slimefun4.libraries.paperlib - - - org.apache.commons.lang - io.github.thebusybiscuit.slimefun4.libraries.commons.lang - - - - - - - *:* - - META-INF/* - - - - - - - - package - - shade - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.2 - - - ${project.basedir} - javadocs - - Slimefun4 - Javadocs - Slimefun4 - Javadocs - false - -html5 - - - - ${paper.javadocs} - - - - - - Slimefun4 - API - io.github.thebusybiscuit.slimefun4.api* - - - Slimefun4 - Core packages - io.github.thebusybiscuit.slimefun4.core* - - - Slimefun4 - Implementations - io.github.thebusybiscuit.slimefun4.implementation* - - - Slimefun4 - Integrations with other - plugins - io.github.thebusybiscuit.slimefun4.integrations* - - - Slimefun4 - Common utility packages - io.github.thebusybiscuit.slimefun4.utils* - - - Slimefun4 - Items - io.github.thebusybiscuit.slimefun4.implementation.items* - - - Slimefun4 - Multiblocks - io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks* - - - Slimefun4 - Electrical Machines - io.github.thebusybiscuit.slimefun4.implementation.items.electric* - - - Slimefun4 - Old packages - me.mrCookieSlime.Slimefun* - - - - - - - - - - - ${basedir}/src/main/resources - true - - - plugin.yml - config.yml - item-models.yml - - wiki.json - languages/translators.json - - tags/*.json - biome-maps/*.json - - languages/**/*.yml - - - - - - ${basedir} - false - - - LICENSE - - - - - - - - - org.junit - junit-bom - 5.11.4 - pom - import - - - - - - - - com.google.code.findbugs - jsr305 - 3.0.2 - provided - - - - - - com.github.Slimefun.dough - dough-api - cb22e71335 - compile - - - com.github.Slimefun.dough - dough-api - cb22e71335 - compile - - - io.papermc - paperlib - 1.0.8 - compile - - - - - io.papermc.paper - paper-api - ${paper.version}-R0.1-SNAPSHOT - provided - - - - - org.junit.jupiter - junit-jupiter - test - - - org.mockito - mockito-core - 5.15.2 - test - - - org.slf4j - slf4j-simple - 2.0.16 - test - - - - com.github.seeseemelk - MockBukkit-v1.21 - 3.133.2 - test - - - - - - org.jetbrains - annotations - - - - - - - com.sk89q.worldedit - worldedit-core - 7.3.9 - provided - - - - - * - * - - - - - com.sk89q.worldedit - worldedit-bukkit - 7.3.9 - provided - - - - - * - * - - - - - com.gmail.nossr50.mcMMO - mcMMO - 2.2.029 - provided - - - - - * - * - - - - - me.clip - placeholderapi - 2.11.6 - provided - - - - - * - * - - - - - me.minebuilders - clearlag-core - 3.1.6 - provided - - - - - * - * - - - - - com.github.LoneDev6 - itemsadder-api - 3.6.1 - provided - - - - - * - * - - - - - net.imprex - orebfuscator-api - 5.4.0 - provided - - - - - * - * - - - - - - commons-lang - commons-lang - 2.6 - compile - - - com.mojang - authlib - 6.0.52 - provided - - - - * - * - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000000..cdde922700 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + val shadowVersion: String by settings + val githubGradleVersion: String by settings + val runPaperVersion: String by settings + plugins { + id("com.gradleup.shadow") version shadowVersion + id("io.github.intisy.github-gradle") version githubGradleVersion + id("xyz.jpenilla.run-paper") version runPaperVersion + } +} +rootProject.name = "Slimefun" diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/package-info.java deleted file mode 100644 index 15243da62f..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains classes that are centered around the - * {@link io.github.thebusybiscuit.slimefun4.api.geo.GEOResource} API. - */ -package io.github.thebusybiscuit.slimefun4.api.geo; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/package-info.java deleted file mode 100644 index 078403c9c2..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package stores classes of the API that are related to the - * {@link io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork}. - */ -package io.github.thebusybiscuit.slimefun4.api.gps; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/package-info.java deleted file mode 100644 index e95ee138f5..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains a few {@link io.github.thebusybiscuit.slimefun4.api.items.ItemGroup} variations. - */ -package io.github.thebusybiscuit.slimefun4.api.items.groups; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/package-info.java deleted file mode 100644 index fd1bd1c8d6..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains a few classes that revolve around the API for - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}, such as - * {@link io.github.thebusybiscuit.slimefun4.api.items.ItemSetting} - */ -package io.github.thebusybiscuit.slimefun4.api.items; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/package-info.java deleted file mode 100644 index 2f6bea34ce..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains various sub classes of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemSetting}. - */ -package io.github.thebusybiscuit.slimefun4.api.items.settings; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/researches/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/researches/package-info.java deleted file mode 100644 index ba6cd3df54..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/researches/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds everything connected to the {@link io.github.thebusybiscuit.slimefun4.api.researches.Research} - * class. - */ -package io.github.thebusybiscuit.slimefun4.api.researches; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/package-info.java deleted file mode 100644 index c8d0bf92b1..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains the various possible {@link io.github.thebusybiscuit.slimefun4.core.attributes.interactions.InteractionResult}s - * that can be returned by an {@link io.github.thebusybiscuit.slimefun4.core.attributes.ExternallyInteractable} object. - */ -package io.github.thebusybiscuit.slimefun4.core.attributes.interactions; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/package-info.java deleted file mode 100644 index 9a2c8c5699..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains all variations of {@link io.github.thebusybiscuit.slimefun4.core.attributes.ItemAttribute} that - * can be assigned to a {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - */ -package io.github.thebusybiscuit.slimefun4.core.attributes; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java deleted file mode 100644 index 14f426c5c6..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains the Settings menu for the {@link io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide} as - * well as the interface {@link io.github.thebusybiscuit.slimefun4.core.guide.options.SlimefunGuideOption} for adding - * your own options - */ -package io.github.thebusybiscuit.slimefun4.core.guide.options; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/package-info.java deleted file mode 100644 index af07c73dce..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains sources related to the - * {@link io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor} - * and any {@link io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation}. - */ -package io.github.thebusybiscuit.slimefun4.core.machines; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/package-info.java deleted file mode 100644 index 23867e7f6a..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds all core mechanics related to a - * {@link io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock}, like that class itself. - */ -package io.github.thebusybiscuit.slimefun4.core.multiblocks; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/package-info.java deleted file mode 100644 index 5f4e747aff..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package provides the core functionality for the {@link io.github.thebusybiscuit.slimefun4.api.network.Network} - * class, such as the {@link io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager} and also the subpackages - * for actual implementations of the {@link io.github.thebusybiscuit.slimefun4.api.network.Network} class. - */ -package io.github.thebusybiscuit.slimefun4.core.networks; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/package-info.java deleted file mode 100644 index d081769ee3..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains everything related to the - * {@link io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService}. - */ -package io.github.thebusybiscuit.slimefun4.core.services.holograms; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/inspectors/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/inspectors/package-info.java deleted file mode 100644 index e6921498b3..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/inspectors/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.core.services.profiler.PerformanceInspector}. - */ -package io.github.thebusybiscuit.slimefun4.core.services.profiler.inspectors; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/package-info.java deleted file mode 100644 index 231751cda5..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package provides the different implementations of our - * {@link io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide} - */ -package io.github.thebusybiscuit.slimefun4.implementation.guide; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/package-info.java deleted file mode 100644 index 5e588c64bb..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds the {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} implementations related to - * the {@link io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.altar; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/package-info.java deleted file mode 100644 index 294fbe3880..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are related to the {@link io.github.thebusybiscuit.slimefun4.implementation.items.androids.ProgrammableAndroid}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/package-info.java deleted file mode 100644 index 7f51e213a4..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are - * related to armor, such as the expandable - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece} class for example. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/package-info.java deleted file mode 100644 index 2b731988d1..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds classes related to - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/package-info.java deleted file mode 100644 index dc8273f08a..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains a few miscellaneous implementations of - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} which are blocks. - * Such as the {@link io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer} for example. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/package-info.java deleted file mode 100644 index 4a49fce0db..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * This package provides the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are related to the {@link io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet}, most - * notably: Cargo Nodes. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/package-info.java deleted file mode 100644 index a64244d8cd..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are used in combination with electricity, like the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Multimeter} or the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet} - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/package-info.java deleted file mode 100644 index b4e98ffd64..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * This package contains any electric machines related to enchanting. - * Prominent examples are the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoEnchanter} and - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoDisenchanter} - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/package-info.java deleted file mode 100644 index e1e938db31..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * This package contains the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are also an - * {@link io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent} with the type {@code CONSUMER}. - * - * Machines do not generate power, they consume it. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/package-info.java deleted file mode 100644 index 0e3cfe961f..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package contains the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that also implement the interface - * {@link io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent} - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/package-info.java deleted file mode 100644 index b3262e8206..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/package-info.java deleted file mode 100644 index 46e84ac6f4..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds the {@link io.github.thebusybiscuit.slimefun4.implementation.items.elevator.ElevatorPlate} and any - * related classes to making the elevator work. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.elevator; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/package-info.java deleted file mode 100644 index 5aeb74b009..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are related to food. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/package-info.java deleted file mode 100644 index c9648a3e9e..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * This package holds implementations of any {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that - * deals with the {@link io.github.thebusybiscuit.slimefun4.api.geo.GEOResource} API. - * The most prominent example of this being the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner} and the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.geo; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/package-info.java deleted file mode 100644 index 822973f363..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are related to the {@link io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.gps; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/package-info.java deleted file mode 100644 index c36abae61b..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are considered magical items. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/package-info.java deleted file mode 100644 index 637d8ad9be..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that is an ancient rune with functionality. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/package-info.java deleted file mode 100644 index a8121cce10..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that is - * considered a "Magical Staff". - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/package-info.java deleted file mode 100644 index f4a6ef052c..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds any {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} related to the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/package-info.java deleted file mode 100644 index 3a92307efb..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are - * related to healing yourself. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/package-info.java deleted file mode 100644 index 0a68f4ec31..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds any miscellaneous {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * implementations. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/package-info.java deleted file mode 100644 index 00d47d6263..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds classes associated with the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.IndustrialMiner}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/package-info.java deleted file mode 100644 index 27d269c53b..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains all the different implementations of - * {@link io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine} - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/package-info.java deleted file mode 100644 index 7f21ba5a38..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains the different classes for each - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - */ -package io.github.thebusybiscuit.slimefun4.implementation.items; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/package-info.java deleted file mode 100644 index 6769d846ae..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are related to the {@link io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/package-info.java deleted file mode 100644 index 86289513a0..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are tools. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/package-info.java deleted file mode 100644 index 748b027ad3..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that are weapons, implementations of - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SlimefunBow} for example. - */ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/package-info.java deleted file mode 100644 index 36f0cae11c..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains implementations of {@link io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.operations; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/package-info.java deleted file mode 100644 index 67b4e2fef0..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains all implementations of {@link io.github.thebusybiscuit.slimefun4.api.geo.GEOResource}. - */ -package io.github.thebusybiscuit.slimefun4.implementation.resources; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/package-info.java deleted file mode 100644 index ff665f2f5c..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemSetting} that are for - * very specific {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem SlimefunItems} and generally not - * very useful out of their context. - */ -package io.github.thebusybiscuit.slimefun4.implementation.settings; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/package-info.java deleted file mode 100644 index c4f513a0bc..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains classes centered around our {@link io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap} - * utility. - */ -package io.github.thebusybiscuit.slimefun4.utils.biomes; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedItemFlag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedItemFlag.java deleted file mode 100644 index 507a903a23..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedItemFlag.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; - -import java.lang.reflect.Field; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.bukkit.inventory.ItemFlag; - -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; - -public class VersionedItemFlag { - - public static final ItemFlag HIDE_ADDITIONAL_TOOLTIP; - - static { - MinecraftVersion version = Slimefun.getMinecraftVersion(); - - HIDE_ADDITIONAL_TOOLTIP = version.isAtLeast(MinecraftVersion.MINECRAFT_1_20_5) - ? ItemFlag.HIDE_ADDITIONAL_TOOLTIP - : getKey("HIDE_POTION_EFFECTS"); - } - - @Nullable - private static ItemFlag getKey(@Nonnull String key) { - try { - Field field = ItemFlag.class.getDeclaredField(key); - return (ItemFlag) field.get(null); - } catch(Exception e) { - return null; - } - } -} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/package-info.java deleted file mode 100644 index 9cd7707847..0000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package holds utilities related to the {@link io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag} enum. - */ -package io.github.thebusybiscuit.slimefun4.utils.tags; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/ErrorReport.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/ErrorReport.java index fc42940f84..bc4170ba7f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/ErrorReport.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api; +package io.github.thebusybiscuit.slimefun5.api; import java.io.File; import java.io.PrintStream; @@ -21,9 +21,9 @@ import org.bukkit.Location; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetProvider; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -276,3 +276,4 @@ public static void tryCatch(@Nonnull Function> } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/MinecraftVersion.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/MinecraftVersion.java index afad06e3bc..904c8bbd9e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/MinecraftVersion.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.api; +package io.github.thebusybiscuit.slimefun5.api; import javax.annotation.Nonnull; import org.apache.commons.lang.Validate; import org.bukkit.Server; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import io.papermc.lib.PaperLib; /** @@ -58,8 +58,21 @@ public enum MinecraftVersion { /** * This constant represents Minecraft (Java Edition) Version 1.21 * ("Tricky Trials") + * This covers versions 1.21.0 through 1.21.3 */ - MINECRAFT_1_21(21, 0, "1.21.x"), + MINECRAFT_1_21(21, 0, 3, "1.21.x"), + + /** + * This constant represents Minecraft (Java Edition) Version 1.21.4+ + * ("The Garden Awakens" and later drops including "Spring to Life", + * "The Copper Age", and "Mounts of Mayhem") + */ + MINECRAFT_1_21_4(21, 4, "1.21.4+"), + + /** + * This constant represents Minecraft (Java Edition) Version 1.26 + */ + MINECRAFT_1_26(26, "1.26.x"), /** * This constant represents an exceptional state in which we were unable @@ -298,3 +311,4 @@ public boolean isBefore(int minecraftVersion, int patchVersion) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunAddon.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunAddon.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunAddon.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunAddon.java index 8d8609c8be..7c9611fa9e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunAddon.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunAddon.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api; +package io.github.thebusybiscuit.slimefun5.api; import java.util.logging.Logger; @@ -10,7 +10,7 @@ import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This is a very basic interface that will be used to identify @@ -98,3 +98,4 @@ default boolean hasDependency(@Nonnull String dependency) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunBranch.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunBranch.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunBranch.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunBranch.java index f755717da1..b86e4716e7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunBranch.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/SlimefunBranch.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api; +package io.github.thebusybiscuit.slimefun5.api; import javax.annotation.Nonnull; @@ -76,3 +76,4 @@ public boolean isOfficial() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AncientAltarCraftEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AncientAltarCraftEvent.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AncientAltarCraftEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AncientAltarCraftEvent.java index 2e282d966a..df634246a7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AncientAltarCraftEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AncientAltarCraftEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -12,9 +12,9 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AncientAltarTask; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AncientAltarListener; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AncientAltarTask; /** * This {@link Event} is fired before an item is dropped by an {@link AncientAltar}. @@ -105,3 +105,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidFarmEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidFarmEvent.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidFarmEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidFarmEvent.java index e2a3d1c9c6..6522e58d6d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidFarmEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidFarmEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -9,8 +9,8 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.AndroidInstance; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.FarmerAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.AndroidInstance; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.FarmerAndroid; /** * This {@link Event} is fired before a {@link FarmerAndroid} harvests a {@link Block}. @@ -119,4 +119,4 @@ public HandlerList getHandlers() { return getHandlerList(); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidMineEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidMineEvent.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidMineEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidMineEvent.java index 66d3c2c158..897e4ab9ac 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AndroidMineEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AndroidMineEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,8 +8,8 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.AndroidInstance; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.MinerAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.AndroidInstance; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.MinerAndroid; /** * This {@link Event} is fired before a {@link MinerAndroid} mines a {@link Block}. @@ -80,4 +80,4 @@ public HandlerList getHandlers() { return getHandlerList(); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncAutoEnchanterProcessEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncAutoEnchanterProcessEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncAutoEnchanterProcessEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncAutoEnchanterProcessEvent.java index 09f306186e..47537592f5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncAutoEnchanterProcessEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncAutoEnchanterProcessEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -8,7 +8,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoEnchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoEnchanter; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -91,3 +91,4 @@ public void setCancelled(boolean cancel) { this.cancelled = cancel; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncMachineOperationFinishEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncMachineOperationFinishEvent.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncMachineOperationFinishEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncMachineOperationFinishEvent.java index 8c6a413a0e..cf7e9a3f26 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncMachineOperationFinishEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncMachineOperationFinishEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -8,8 +8,8 @@ import org.bukkit.event.HandlerList; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineProcessor; /** * This {@link Event} is fired whenever an {@link MachineProcessor} has completed a {@link MachineOperation}. @@ -75,3 +75,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncProfileLoadEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncProfileLoadEvent.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncProfileLoadEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncProfileLoadEvent.java index b05f8e5c30..d2693e5507 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AsyncProfileLoadEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AsyncProfileLoadEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import java.util.UUID; @@ -9,7 +9,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; /** * This {@link Event} is called when the {@link PlayerProfile} of a {@link Player} @@ -73,3 +73,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoDisenchantEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoDisenchantEvent.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoDisenchantEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoDisenchantEvent.java index 0a4585470a..ca61e71844 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoDisenchantEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoDisenchantEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -7,7 +7,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoDisenchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoDisenchanter; /** * An {@link Event} that is called whenever an {@link AutoDisenchanter} has @@ -62,3 +62,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoEnchantEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoEnchantEvent.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoEnchantEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoEnchantEvent.java index 30d34df9d8..68ec1aba44 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/AutoEnchantEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/AutoEnchantEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -7,7 +7,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoEnchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoEnchanter; /** * An {@link Event} that is called whenever an {@link AutoEnchanter} is trying to enchant @@ -62,3 +62,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/BlockPlacerPlaceEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/BlockPlacerPlaceEvent.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/BlockPlacerPlaceEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/BlockPlacerPlaceEvent.java index 59ee4bdf51..5b187c5e55 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/BlockPlacerPlaceEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/BlockPlacerPlaceEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,8 +11,8 @@ import org.bukkit.event.block.BlockEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer; /** * This {@link Event} is fired whenever a {@link BlockPlacer} wants to place a {@link Block}. @@ -117,3 +117,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ClimbingPickLaunchEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ClimbingPickLaunchEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ClimbingPickLaunchEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ClimbingPickLaunchEvent.java index e5bb91dc24..1845a189ab 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ClimbingPickLaunchEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ClimbingPickLaunchEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ClimbingPick; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ClimbingPick; /** * An {@link Event} that is called whenever a {@link Player} has @@ -118,3 +118,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/CoolerFeedPlayerEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/CoolerFeedPlayerEvent.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/CoolerFeedPlayerEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/CoolerFeedPlayerEvent.java index b6a3d579cb..e4bf6571ab 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/CoolerFeedPlayerEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/CoolerFeedPlayerEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -13,7 +13,7 @@ import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; /** * This {@link Event} is called whenever a {@link Player} is @@ -111,3 +111,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ExplosiveToolBreakBlocksEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ExplosiveToolBreakBlocksEvent.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ExplosiveToolBreakBlocksEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ExplosiveToolBreakBlocksEvent.java index e0bd18e6e0..90a55d3fdb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ExplosiveToolBreakBlocksEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ExplosiveToolBreakBlocksEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import java.util.List; @@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosiveTool; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ExplosiveTool; /** * This {@link Event} is called when an {@link ExplosiveTool} is used to break blocks. @@ -112,3 +112,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/GEOResourceGenerationEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/GEOResourceGenerationEvent.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/GEOResourceGenerationEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/GEOResourceGenerationEvent.java index cc659b7734..edb4a99760 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/GEOResourceGenerationEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/GEOResourceGenerationEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,9 +11,9 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.geo.ResourceManager; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.geo.ResourceManager; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOScanner; /** * This {@link Event} is fired whenever a {@link GEOResource} is being freshly generated. @@ -147,3 +147,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockCraftEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockCraftEvent.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockCraftEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockCraftEvent.java index 7a3fc3c535..f4cffc8e78 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockCraftEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockCraftEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; /** * This {@link Event} is called when a {@link Player} crafts an item using a {@link MultiBlockMachine}. @@ -118,3 +118,4 @@ public void setCancelled(boolean cancel) { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockInteractEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockInteractEvent.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockInteractEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockInteractEvent.java index 067aa5b180..d6ba84af43 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/MultiBlockInteractEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/MultiBlockInteractEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,7 +11,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; /** * This {@link Event} is called when a {@link Player} interacts with a {@link MultiBlock}. @@ -88,3 +88,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerLanguageChangeEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerLanguageChangeEvent.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerLanguageChangeEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerLanguageChangeEvent.java index 5f13972832..1092622f23 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerLanguageChangeEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerLanguageChangeEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -6,8 +6,8 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.core.services.LocalizationService; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; /** * This {@link Event} gets called when a {@link Player} has switched their {@link Language}. @@ -73,3 +73,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerPreResearchEvent.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerPreResearchEvent.java index 1e0a618697..d717b17b1f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerPreResearchEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,10 +9,10 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.guide.CheatSheetSlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.guide.CheatSheetSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; /** * This {@link Event} is called whenever a {@link Player} clicks to unlock a {@link Research}. @@ -80,3 +80,4 @@ public void setCancelled(boolean cancelled) { this.cancelled = cancelled; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerRightClickEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerRightClickEvent.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerRightClickEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerRightClickEvent.java index 30c9c927af..5bc1aedf42 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerRightClickEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/PlayerRightClickEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import java.util.Optional; @@ -17,7 +17,7 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.data.TriStateOptional; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -189,3 +189,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/RadiationDamageEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/RadiationDamageEvent.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/RadiationDamageEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/RadiationDamageEvent.java index b3ef284e75..b945672a6d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/RadiationDamageEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/RadiationDamageEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -67,3 +67,4 @@ public void setCancelled(boolean cancelled) { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ReactorExplodeEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ReactorExplodeEvent.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ReactorExplodeEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ReactorExplodeEvent.java index 859a80935b..befe25b3e1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ReactorExplodeEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ReactorExplodeEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -7,8 +7,8 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; /** * The {@link ReactorExplodeEvent} is called whenever a reactor explodes. @@ -63,3 +63,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ResearchUnlockEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ResearchUnlockEvent.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ResearchUnlockEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ResearchUnlockEvent.java index 59d097a2ad..d17446618e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/ResearchUnlockEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/ResearchUnlockEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -9,7 +9,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; /** * This {@link Event} is called whenever a {@link Player} unlocks a {@link Research}. @@ -69,3 +69,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockBreakEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockBreakEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockBreakEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockBreakEvent.java index 8554a69499..ef3e9e9a7e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockBreakEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockBreakEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This {@link Event} is fired whenever a {@link SlimefunItem} placed as a {@link Block} in the world is broken. @@ -104,3 +104,4 @@ public void setCancelled(boolean cancelled) { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockPlaceEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockPlaceEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockPlaceEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockPlaceEvent.java index 2978b9d77a..ad1c35c2f2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunBlockPlaceEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunBlockPlaceEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,7 +10,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This {@link Event} is fired whenever a {@link SlimefunItem} is placed as a {@link Block} in the world. @@ -103,3 +103,4 @@ public void setCancelled(boolean cancelled) { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunGuideOpenEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunGuideOpenEvent.java index ecf46a5311..b4c6c10d42 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunGuideOpenEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -9,7 +9,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; /** * This {@link Event} is called whenever a {@link Player} tries to open the Slimefun Guide book. @@ -102,3 +102,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemRegistryFinalizedEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemRegistryFinalizedEvent.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemRegistryFinalizedEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemRegistryFinalizedEvent.java index 12943c82bf..4221ab7485 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemRegistryFinalizedEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemRegistryFinalizedEvent.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** @@ -33,3 +33,4 @@ public HandlerList getHandlers() { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemSpawnEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemSpawnEvent.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemSpawnEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemSpawnEvent.java index 95b5fadf6f..041dd250eb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunItemSpawnEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/SlimefunItemSpawnEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import java.util.Optional; @@ -14,7 +14,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; /** * This {@link Event} is fired whenever slimefun drops an {@link ItemStack}. @@ -129,3 +129,4 @@ public void setCancelled(boolean cancelled) { return getHandlerList(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/TalismanActivateEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/TalismanActivateEvent.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/TalismanActivateEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/TalismanActivateEvent.java index b8515bed47..2ff9482887 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/TalismanActivateEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/TalismanActivateEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,7 +9,7 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman; /** * This {@link PlayerEvent} is called when a {@link Player} activates a {@link Talisman} @@ -94,3 +94,4 @@ public void setCancelled(boolean cancel) { return handlers; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/WaypointCreateEvent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/WaypointCreateEvent.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/WaypointCreateEvent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/WaypointCreateEvent.java index 4253f7983e..e3113422bb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/WaypointCreateEvent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/WaypointCreateEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import javax.annotation.Nonnull; @@ -9,9 +9,9 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; -import io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork; -import io.github.thebusybiscuit.slimefun4.api.gps.TeleportationManager; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.gps.GPSNetwork; +import io.github.thebusybiscuit.slimefun5.api.gps.TeleportationManager; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; /** * A {@link WaypointCreateEvent} is called when a {@link Player} creates a new waypoint. @@ -120,3 +120,4 @@ public HandlerList getHandlers() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/package-info.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/events/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/events/package-info.java index cb36d7d8c2..9a2dce6292 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/events/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/events/package-info.java @@ -2,4 +2,4 @@ * This package contains all extensions of {@link org.bukkit.event.Event} that Slimefun provides * and allows you to listen to. */ -package io.github.thebusybiscuit.slimefun4.api.events; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.api.events; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/BiomeMapException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/BiomeMapException.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/BiomeMapException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/BiomeMapException.java index 8a116e283c..bbbc08fa1c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/BiomeMapException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/BiomeMapException.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.NamespacedKey; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * A {@link BiomeMapException} is thrown whenever a {@link BiomeMap} @@ -45,3 +45,4 @@ public BiomeMapException(NamespacedKey key, Throwable cause) { super("Biome Map '" + key + "' has been misconfigured (" + cause.getMessage() + ')', cause); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IdConflictException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IdConflictException.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IdConflictException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IdConflictException.java index bc9b5b4fe0..4c25b3c9c4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IdConflictException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IdConflictException.java @@ -1,8 +1,8 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * An {@link IdConflictException} is thrown whenever two Addons try to add @@ -29,3 +29,4 @@ public IdConflictException(SlimefunItem item1, SlimefunItem item2) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IncompatibleItemHandlerException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IncompatibleItemHandlerException.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IncompatibleItemHandlerException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IncompatibleItemHandlerException.java index e80f23a505..c64d9dbd7a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/IncompatibleItemHandlerException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/IncompatibleItemHandlerException.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; /** * An {@link IncompatibleItemHandlerException} is thrown whenever a {@link Plugin} tried @@ -43,3 +43,4 @@ public IncompatibleItemHandlerException(String message, SlimefunItem item, ItemH } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/MissingDependencyException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/MissingDependencyException.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/MissingDependencyException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/MissingDependencyException.java index d88ef290ec..f309cb5124 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/MissingDependencyException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/MissingDependencyException.java @@ -1,8 +1,8 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; /** * A {@link MissingDependencyException} is thrown when a {@link SlimefunAddon} tried @@ -32,3 +32,4 @@ public MissingDependencyException(SlimefunAddon addon, String dependency) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/PrematureCodeException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/PrematureCodeException.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/PrematureCodeException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/PrematureCodeException.java index 1918fdb5d5..7dda11e1cd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/PrematureCodeException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/PrematureCodeException.java @@ -1,8 +1,8 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; /** * A {@link PrematureCodeException} is thrown when a {@link SlimefunAddon} tried @@ -28,3 +28,4 @@ public PrematureCodeException(String message) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/TagMisconfigurationException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/TagMisconfigurationException.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/TagMisconfigurationException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/TagMisconfigurationException.java index 165f5c3be6..c34cdd88f7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/TagMisconfigurationException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/TagMisconfigurationException.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.NamespacedKey; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * An {@link TagMisconfigurationException} is thrown whenever a {@link SlimefunTag} @@ -46,3 +46,4 @@ public TagMisconfigurationException(NamespacedKey key, Throwable cause) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/UnregisteredItemException.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/UnregisteredItemException.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/UnregisteredItemException.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/UnregisteredItemException.java index 2d2549bf00..eda7a95673 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/UnregisteredItemException.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/UnregisteredItemException.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.api.exceptions; +package io.github.thebusybiscuit.slimefun5.api.exceptions; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * An {@link UnregisteredItemException} is thrown whenever a {@link Plugin} tried to @@ -33,3 +33,4 @@ public UnregisteredItemException(SlimefunItem item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/package-info.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/package-info.java index da014fff27..9af841bb6e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/exceptions/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/exceptions/package-info.java @@ -2,4 +2,4 @@ * This package contains all different extensions of {@link java.lang.Exception} that Slimefun * uses internally. */ -package io.github.thebusybiscuit.slimefun4.api.exceptions; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.api.exceptions; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/GEOResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/GEOResource.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/GEOResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/GEOResource.java index 36aa5aee76..b50adcc5f3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/GEOResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/GEOResource.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.geo; +package io.github.thebusybiscuit.slimefun5.api.geo; import javax.annotation.Nonnull; @@ -10,11 +10,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.GEOResourceGenerationEvent; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner; +import io.github.thebusybiscuit.slimefun5.api.events.GEOResourceGenerationEvent; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOScanner; /** * A {@link GEOResource} is a virtual resource that can be thought of as world-gen. @@ -101,3 +101,4 @@ default String getName(@Nonnull Player p) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/ResourceManager.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/ResourceManager.java index e88ec4e15e..eb05e51f99 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/ResourceManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.geo; +package io.github.thebusybiscuit.slimefun5.api.geo; import java.util.ArrayList; import java.util.Comparator; @@ -23,14 +23,14 @@ import io.github.bakedlibs.dough.blocks.BlockPosition; import io.github.bakedlibs.dough.config.Config; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.events.GEOResourceGenerationEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.events.GEOResourceGenerationEvent; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOScanner; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -276,3 +276,4 @@ public void scan(@Nonnull Player p, @Nonnull Block block, int page) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/package-info.java new file mode 100644 index 0000000000..c25e299825 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/geo/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains classes that are centered around the + * {@link io.github.thebusybiscuit.slimefun5.api.geo.GEOResource} API. + */ +package io.github.thebusybiscuit.slimefun5.api.geo; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/GPSNetwork.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/GPSNetwork.java index 8d3a951188..33fa295850 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/GPSNetwork.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.gps; +package io.github.thebusybiscuit.slimefun5.api.gps; import java.util.HashMap; import java.util.HashSet; @@ -23,19 +23,19 @@ import io.github.bakedlibs.dough.chat.ChatInput; import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.geo.ResourceManager; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.gps.GPSTransmitter; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.events.WaypointCreateEvent; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.geo.ResourceManager; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.gps.GPSTransmitter; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -377,3 +377,4 @@ public ResourceManager getResourceManager() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/TeleportationManager.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/TeleportationManager.java index 40035920ba..c49f77a516 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/TeleportationManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.gps; +package io.github.thebusybiscuit.slimefun5.api.gps; import java.util.HashSet; import java.util.Set; @@ -19,14 +19,14 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; import io.papermc.lib.PaperLib; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -240,3 +240,4 @@ private void onTeleport(Player p, Location destination, boolean success, boolean } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/Waypoint.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/Waypoint.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/Waypoint.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/Waypoint.java index 468b70af6b..0b7f55eee6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/Waypoint.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/Waypoint.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.gps; +package io.github.thebusybiscuit.slimefun5.api.gps; import java.util.Objects; import java.util.UUID; @@ -13,10 +13,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter; +import io.github.thebusybiscuit.slimefun5.api.events.WaypointCreateEvent; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter; /** * A {@link Waypoint} represents a named {@link Location} that was created by a {@link Player}. @@ -181,3 +181,4 @@ public boolean equals(Object obj) { && name.equals(waypoint.getName()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/package-info.java new file mode 100644 index 0000000000..a24ffe8e13 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/gps/package-info.java @@ -0,0 +1,5 @@ +/** + * This package stores classes of the API that are related to the + * {@link io.github.thebusybiscuit.slimefun5.api.gps.GPSNetwork}. + */ +package io.github.thebusybiscuit.slimefun5.api.gps; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/HashedArmorpiece.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/HashedArmorpiece.java index 92a66e5a2f..b671dd5c15 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/HashedArmorpiece.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.util.Optional; @@ -11,8 +11,8 @@ import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.armor.SlimefunArmorTask; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.armor.SlimefunArmorTask; /** * This class serves as a way of checking whether a {@link Player} has changed their armor @@ -104,3 +104,4 @@ public String toString() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemGroup.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemGroup.java index 8524c6a7e7..f5d2256dbc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.util.ArrayList; import java.util.Arrays; @@ -15,17 +15,16 @@ import org.bukkit.Keyed; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.SeasonalItemGroup; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.groups.LockedItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.SeasonalItemGroup; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; /** * Represents an item group, which structure @@ -84,9 +83,7 @@ public ItemGroup(NamespacedKey key, ItemStack item, int tier) { this.key = key; ItemMeta meta = item.getItemMeta(); - meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); - meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); - meta.addItemFlags(VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); + VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ATTRIBUTES, VersionedItemFlag.HIDE_ENCHANTS, VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); this.item.setItemMeta(meta); this.tier = tier; } @@ -386,3 +383,4 @@ public boolean isHidden(@Nonnull Player p) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemHandler.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemHandler.java index 251daefe14..e81e6744d0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemHandler.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.util.Optional; import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityKillHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityKillHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; /** * An {@link ItemHandler} represents a certain action that a {@link SlimefunItem} @@ -53,3 +53,4 @@ default Optional validate(@Nonnull SlimefunIte @Nonnull Class getIdentifier(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSetting.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSetting.java index 4a49b89ec8..981fefbfea 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.util.List; import java.util.Objects; @@ -9,7 +9,7 @@ import org.apache.commons.lang.Validate; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class represents a Setting for a {@link SlimefunItem} that can be modified via @@ -222,3 +222,4 @@ public final boolean equals(Object obj) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSpawnReason.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSpawnReason.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSpawnReason.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSpawnReason.java index 1d1589afd0..c63655a64f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSpawnReason.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemSpawnReason.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunItemSpawnEvent; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.ChristmasPresent; -import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.EasterEgg; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfContainment; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunItemSpawnEvent; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.items.seasonal.ChristmasPresent; +import io.github.thebusybiscuit.slimefun5.implementation.items.seasonal.EasterEgg; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfContainment; /** * This enum holds the different reasons as to why we may need to spawn an item. @@ -67,3 +67,4 @@ public enum ItemSpawnReason { MISC; } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemState.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemState.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemState.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemState.java index 0dfaaef4bb..5ad9316769 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemState.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/ItemState.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; /** * Defines whether a SlimefunItem is enabled, disabled or fall-back to its vanilla behavior. @@ -34,3 +34,4 @@ public enum ItemState { VANILLA_FALLBACK; } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItem.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItem.java index 3d52b81245..cb0d4c8283 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.util.Arrays; import java.util.Collection; @@ -24,26 +24,26 @@ import io.github.bakedlibs.dough.collections.OptionalMap; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IdConflictException; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.exceptions.MissingDependencyException; -import io.github.thebusybiscuit.slimefun4.api.exceptions.UnregisteredItemException; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotConfigurable; -import io.github.thebusybiscuit.slimefun4.core.attributes.Placeable; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.handlers.GlobalItemHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoDisenchanter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoEnchanter; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.SlimefunBranch; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IdConflictException; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.exceptions.MissingDependencyException; +import io.github.thebusybiscuit.slimefun5.api.exceptions.UnregisteredItemException; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.SlimefunRegistry; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotConfigurable; +import io.github.thebusybiscuit.slimefun5.core.attributes.Placeable; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.handlers.GlobalItemHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoDisenchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoEnchanter; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -865,7 +865,7 @@ public void postRegister() { */ public final void addOfficialWikipage(@Nonnull String page) { Validate.notNull(page, "Wiki page cannot be null."); - wikiURL = Optional.of("https://github.com/Slimefun/Slimefun4/wiki/" + page); + wikiURL = Optional.of("https://github.com/Slimefun5/Slimefun5/wiki/" + page); } /** @@ -1194,3 +1194,4 @@ public final int hashCode() { return Optional.ofNullable(getByItem(item)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItemStack.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItemStack.java index 8a427b249f..5b704a7a74 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/SlimefunItemStack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items; +package io.github.thebusybiscuit.slimefun5.api.items; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -38,13 +38,12 @@ import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.ItemMetaSnapshot; -import io.github.bakedlibs.dough.skins.PlayerHead; -import io.github.bakedlibs.dough.skins.PlayerSkin; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.exceptions.PrematureCodeException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.exceptions.PrematureCodeException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; /** * The {@link SlimefunItemStack} functions as the base for any @@ -172,7 +171,7 @@ public SlimefunItemStack(@Nonnull String id, @Nonnull Color color, @Nonnull Poti potionMeta.addCustomEffect(effect, true); if (effect.getType().equals(PotionEffectType.SATURATION)) { - im.addItemFlags(VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); + VersionedItemFlag.addFlags(im, VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); } } }); @@ -284,8 +283,7 @@ public void setAmount(int amount) { return new ItemStack(Material.PLAYER_HEAD); } - PlayerSkin skin = PlayerSkin.fromBase64(getTexture(id, texture)); - return PlayerHead.getItemStack(skin); + return VersionedPlayerHead.getItemStack(getTexture(id, texture)); } private static @Nonnull String getTexture(@Nonnull String id, @Nonnull String texture) { @@ -573,3 +571,4 @@ public HoverEvent asHoverEvent() { return this.delegate.asHoverEvent(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/FlexItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/FlexItemGroup.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/FlexItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/FlexItemGroup.java index 92f137dcfc..2c3ef60afa 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/FlexItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/FlexItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.groups; +package io.github.thebusybiscuit.slimefun5.api.items.groups; import java.util.List; @@ -9,11 +9,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; /** * A {@link FlexItemGroup} is a {@link ItemGroup} inside the {@link SlimefunGuide} that can @@ -97,3 +97,4 @@ public final void remove(@Nonnull SlimefunItem item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/LockedItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/LockedItemGroup.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/LockedItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/LockedItemGroup.java index 826ddbf301..b72530991a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/LockedItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/LockedItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.groups; +package io.github.thebusybiscuit.slimefun5.api.items.groups; import java.util.ArrayList; import java.util.HashSet; @@ -14,11 +14,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * Represents a {@link ItemGroup} that cannot be opened until the parent group(s) @@ -166,3 +166,4 @@ public boolean hasUnlocked(@Nonnull Player p, @Nonnull PlayerProfile profile) { return true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/NestedItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/NestedItemGroup.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/NestedItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/NestedItemGroup.java index 0d99f7347e..d9633cd6d6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/NestedItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/NestedItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.groups; +package io.github.thebusybiscuit.slimefun5.api.items.groups; import java.util.ArrayList; import java.util.List; @@ -13,14 +13,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.guide.GuideHistory; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.guide.GuideHistory; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -145,3 +145,4 @@ private void openGuide(Player p, PlayerProfile profile, SlimefunGuideMode mode, } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SeasonalItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SeasonalItemGroup.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SeasonalItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SeasonalItemGroup.java index c61212c265..696b438b70 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SeasonalItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SeasonalItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.groups; +package io.github.thebusybiscuit.slimefun5.api.items.groups; import java.time.LocalDate; import java.time.Month; @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; /** * Represents a {@link ItemGroup} that is only displayed in the Guide during @@ -65,3 +65,4 @@ public boolean isAccessible(@Nonnull Player p) { return super.isAccessible(p); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SubItemGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SubItemGroup.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SubItemGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SubItemGroup.java index 35b5aef3d1..fc153f7840 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/groups/SubItemGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/SubItemGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.groups; +package io.github.thebusybiscuit.slimefun5.api.items.groups; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,9 +8,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * The {@link SubItemGroup} is a child {@link ItemGroup} of the @@ -96,3 +96,4 @@ public final void register(@Nonnull SlimefunAddon addon) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/package-info.java new file mode 100644 index 0000000000..cc15d893ca --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/groups/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains a few {@link io.github.thebusybiscuit.slimefun5.api.items.ItemGroup} variations. + */ +package io.github.thebusybiscuit.slimefun5.api.items.groups; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/package-info.java new file mode 100644 index 0000000000..0a0f1021df --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains a few classes that revolve around the API for + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem}, such as + * {@link io.github.thebusybiscuit.slimefun5.api.items.ItemSetting} + */ +package io.github.thebusybiscuit.slimefun5.api.items; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/DoubleRangeSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/DoubleRangeSetting.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/DoubleRangeSetting.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/DoubleRangeSetting.java index 3caeb974b3..467be76ae5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/DoubleRangeSetting.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/DoubleRangeSetting.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.apache.commons.lang.Validate; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This variation of {@link ItemSetting} allows you to define an {@link Double} range @@ -62,3 +62,4 @@ public final double getMaximum() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/EnumSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/EnumSetting.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/EnumSetting.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/EnumSetting.java index a588a02abd..8cc931c76e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/EnumSetting.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/EnumSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import java.util.Arrays; import java.util.stream.Collectors; @@ -6,8 +6,8 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This variation of {@link ItemSetting} allows you to allow {@link Enum} constants to be @@ -76,3 +76,4 @@ public boolean validateInput(String input) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/IntRangeSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/IntRangeSetting.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/IntRangeSetting.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/IntRangeSetting.java index 58e5dc34bf..7bd5a1fefa 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/IntRangeSetting.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/IntRangeSetting.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.apache.commons.lang.Validate; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This variation of {@link ItemSetting} allows you to define an {@link Integer} range @@ -62,3 +62,4 @@ public final int getMaximum() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/MaterialTagSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/MaterialTagSetting.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/MaterialTagSetting.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/MaterialTagSetting.java index 047f08d4d5..0275e5532d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/settings/MaterialTagSetting.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/MaterialTagSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import java.util.List; import java.util.stream.Collectors; @@ -9,8 +9,8 @@ import org.bukkit.Material; import org.bukkit.Tag; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This variation of {@link ItemSetting} allows you to define a default {@link Tag}. @@ -80,3 +80,4 @@ public boolean validateInput(List input) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/package-info.java new file mode 100644 index 0000000000..ac30de6e17 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/items/settings/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains various sub classes of {@link io.github.thebusybiscuit.slimefun5.api.items.ItemSetting}. + */ +package io.github.thebusybiscuit.slimefun5.api.items.settings; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/Network.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/Network.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/network/Network.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/network/Network.java index 49fb36520e..6afa3a43d1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/Network.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/Network.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.network; +package io.github.thebusybiscuit.slimefun5.api.network; import java.util.ArrayDeque; import java.util.HashSet; @@ -16,9 +16,9 @@ import org.bukkit.World; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.NetworkListener; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.NetworkListener; /** * An abstract Network class to manage networks in a stateful way @@ -269,3 +269,4 @@ public void tick() { discoverStep(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkComponent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkComponent.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkComponent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkComponent.java index a741ceadde..069a3abcf9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkComponent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkComponent.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.api.network; +package io.github.thebusybiscuit.slimefun5.api.network; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; /** * This enum holds the different types of components a {@link Network} can have. @@ -31,4 +31,4 @@ public enum NetworkComponent { */ TERMINUS; -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkVisualizer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkVisualizer.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkVisualizer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkVisualizer.java index 256442972a..f67a2eb3e9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/NetworkVisualizer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/NetworkVisualizer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.network; +package io.github.thebusybiscuit.slimefun5.api.network; import javax.annotation.Nonnull; @@ -7,7 +7,7 @@ import org.bukkit.Location; import org.bukkit.Particle.DustOptions; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; /** * This class represents the visualizer task of a given {@link Network}. @@ -63,3 +63,4 @@ private void spawnParticles(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/package-info.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/network/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/network/package-info.java index b2232cf176..e312c1e076 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/network/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/network/package-info.java @@ -1,4 +1,4 @@ /** * This package provides the API infrastructure for networks, such as the Cargo- or Energy net. */ -package io.github.thebusybiscuit.slimefun4.api.network; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.api.network; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/package-info.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/package-info.java index 7929e334cc..ae65d81742 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/package-info.java @@ -2,4 +2,4 @@ * This package contains a bunch of classes and sub-packages related to the interaction * with Slimefun via an API. */ -package io.github.thebusybiscuit.slimefun4.api; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.api; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerBackpack.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerBackpack.java index c0886778df..527ef4ac8a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerBackpack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.player; +package io.github.thebusybiscuit.slimefun5.api.player; import java.io.File; import java.util.ArrayList; @@ -17,9 +17,9 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BackpackListener; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BackpackListener; /** * This class represents the instance of a {@link SlimefunBackpack} that is ready to @@ -264,3 +264,4 @@ public static PlayerBackpack newBackpack(UUID ownerId, int id, int size) { return backpack; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java index 8dfc7414f8..b853cc84a1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/player/PlayerProfile.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.player; +package io.github.thebusybiscuit.slimefun5.api.player; import java.util.Collection; import java.util.Iterator; @@ -14,7 +14,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.github.thebusybiscuit.slimefun4.storage.data.PlayerData; +import io.github.thebusybiscuit.slimefun5.storage.data.PlayerData; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -30,18 +30,18 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.events.AsyncProfileLoadEvent; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectiveArmor; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.core.guide.GuideHistory; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.events.AsyncProfileLoadEvent; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectiveArmor; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.core.guide.GuideHistory; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; /** * A class that can store a Player's {@link Research} progress for caching purposes. @@ -403,7 +403,7 @@ public static boolean get(@Nonnull OfflinePlayer p, @Nonnull Consumer getResearch(@Nullable NamespacedKey key) { public String toString() { return "Research (" + getKey() + ')'; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/api/researches/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/api/researches/package-info.java new file mode 100644 index 0000000000..482c367ad9 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/api/researches/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds everything connected to the {@link io.github.thebusybiscuit.slimefun5.api.researches.Research} + * class. + */ +package io.github.thebusybiscuit.slimefun5.api.researches; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/SlimefunRegistry.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/SlimefunRegistry.java index ab8d41bd21..7f2e9fdced 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/SlimefunRegistry.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core; +package io.github.thebusybiscuit.slimefun5.core; import java.util.ArrayList; import java.util.Collections; @@ -25,19 +25,19 @@ import io.github.bakedlibs.dough.collections.KeyMap; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideImplementation; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.guide.CheatSheetSlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideImplementation; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.guide.CheatSheetSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; import me.mrCookieSlime.Slimefun.api.BlockInfoConfig; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -363,3 +363,4 @@ public NamespacedKey getGuideDataKey() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DamageableItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DamageableItem.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DamageableItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DamageableItem.java index 74f4a5ef88..96e0895a72 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DamageableItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DamageableItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -11,9 +11,9 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.UnbreakingAlgorithm; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.UnbreakingAlgorithm; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; /** * This interface, when attached to a {@link SlimefunItem}, provides an easy method for damaging @@ -92,3 +92,4 @@ default boolean evaluateUnbreakingEnchantment(int unbreakingLevel) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DistinctiveItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DistinctiveItem.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DistinctiveItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DistinctiveItem.java index 150bef8319..83e3aa7f62 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/DistinctiveItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/DistinctiveItem.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; import javax.annotation.Nonnull; @@ -31,3 +31,4 @@ public interface DistinctiveItem extends ItemAttribute { */ boolean canStack(@Nonnull ItemMeta itemMetaOne, @Nonnull ItemMeta itemMetaTwo); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetComponent.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetComponent.java index 64a9063ec3..3a9a075a03 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetComponent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import java.util.logging.Level; @@ -8,13 +8,13 @@ import org.bukkit.Location; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.Capacitor; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.Capacitor; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -200,3 +200,4 @@ default void removeCharge(@Nonnull Location l, int charge) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetProvider.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetProvider.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetProvider.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetProvider.java index 10dafe4d4b..66cc9b1d4a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetProvider.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/EnergyNetProvider.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; import org.bukkit.Location; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.AbstractEnergyProvider; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.AbstractEnergyProvider; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; @@ -64,3 +64,4 @@ default boolean willExplode(@Nonnull Location l, @Nonnull Config data) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ExternallyInteractable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ExternallyInteractable.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ExternallyInteractable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ExternallyInteractable.java index 8204409886..76836c24a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ExternallyInteractable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ExternallyInteractable.java @@ -1,7 +1,7 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.interactions.InteractionResult; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.interactions.InteractionResult; import org.bukkit.Location; import javax.annotation.Nonnull; @@ -28,3 +28,4 @@ public interface ExternallyInteractable { InteractionResult onInteract(@Nonnull Location location); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/HologramOwner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/HologramOwner.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/HologramOwner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/HologramOwner.java index b14e32c35c..9bb79923b5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/HologramOwner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/HologramOwner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; @@ -7,9 +7,9 @@ import org.bukkit.util.Vector; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.HologramProjector; +import io.github.thebusybiscuit.slimefun5.core.services.holograms.HologramsService; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.HologramProjector; /** * This {@link ItemAttribute} manages holograms. @@ -63,3 +63,4 @@ default Vector getHologramOffset(@Nonnull Block block) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ItemAttribute.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ItemAttribute.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ItemAttribute.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ItemAttribute.java index 44236086ba..edca2dcda8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ItemAttribute.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ItemAttribute.java @@ -1,9 +1,9 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * An empty interface that only serves the purpose of bundling together all @@ -28,3 +28,4 @@ public interface ItemAttribute { String getId(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineProcessHolder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineProcessHolder.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineProcessHolder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineProcessHolder.java index 7a1c283f6b..6abf785ae3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineProcessHolder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineProcessHolder.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineProcessor; /** * This {@link ItemAttribute} marks a {@link SlimefunItem} as a {@link MachineProcessHolder}. @@ -27,3 +27,4 @@ public interface MachineProcessHolder extends ItemAt MachineProcessor getMachineProcessor(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineTier.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineTier.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineTier.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineTier.java index eb01529ece..87e09a95e3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineTier.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineTier.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; @@ -23,3 +23,4 @@ public String toString() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineType.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineType.java index c408e69385..70c939f1b5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/MachineType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; @@ -20,3 +20,4 @@ public String toString() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotConfigurable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotConfigurable.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotConfigurable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotConfigurable.java index f69984d9fd..73566c3cae 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotConfigurable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotConfigurable.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * Implement this interface for any {@link SlimefunItem} to prevent @@ -12,3 +12,4 @@ public interface NotConfigurable extends ItemAttribute { } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotHopperable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotHopperable.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotHopperable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotHopperable.java index 5e284e5695..f6ea87341f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotHopperable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotHopperable.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -12,3 +12,4 @@ public interface NotHopperable extends ItemAttribute { } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotPlaceable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotPlaceable.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotPlaceable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotPlaceable.java index 464e91b911..551bb5b306 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/NotPlaceable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/NotPlaceable.java @@ -1,9 +1,9 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import org.bukkit.block.Block; import org.bukkit.event.block.BlockPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * Implement this interface for any {@link SlimefunItem} to prevent @@ -19,3 +19,4 @@ public interface NotPlaceable extends ItemAttribute { } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/PiglinBarterDrop.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/PiglinBarterDrop.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/PiglinBarterDrop.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/PiglinBarterDrop.java index cda9536f8b..afbd9fa6a5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/PiglinBarterDrop.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/PiglinBarterDrop.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import org.bukkit.entity.Piglin; import org.bukkit.event.entity.EntityDropItemEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.PiglinListener; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.PiglinListener; /** * This interface, when attached to a {@link SlimefunItem}, provides a variable (0-100%) chance for @@ -33,3 +33,4 @@ public interface PiglinBarterDrop extends ItemAttribute { int getBarteringLootChance(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Placeable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Placeable.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Placeable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Placeable.java index 28130d102e..37b80c0192 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Placeable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Placeable.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import java.util.Collection; @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * DO NOT IMPLEMENT THIS INTERFACE @@ -42,3 +42,4 @@ default boolean useVanillaBlockBreaking() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectionType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectionType.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectionType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectionType.java index ac0e488c7f..46fa7b330b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectionType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectionType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import org.bukkit.entity.Bee; @@ -30,3 +30,4 @@ public enum ProtectionType { FLYING_INTO_WALL; } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectiveArmor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectiveArmor.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectiveArmor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectiveArmor.java index f51c943780..81873f3732 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/ProtectiveArmor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/ProtectiveArmor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -6,8 +6,8 @@ import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.HazmatArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.HazmatArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; /** * Implement this interface to a {@link SlimefunArmorPiece} to protect @@ -51,3 +51,4 @@ public interface ProtectiveArmor extends ItemAttribute { @Nullable NamespacedKey getArmorSetId(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RadiationSymptom.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RadiationSymptom.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RadiationSymptom.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RadiationSymptom.java index 154b48efc4..610c7d067c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RadiationSymptom.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RadiationSymptom.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.RadiationUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; /** * An enum of potential radiation symptoms. @@ -68,3 +68,4 @@ public boolean shouldApply(int exposure) { return exposure >= minExposure; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactive.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactive.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactive.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactive.java index 22b09378d0..7bf55433ba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactive.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactive.java @@ -1,8 +1,8 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This Interface, when attached to a class that inherits from {@link SlimefunItem}, marks @@ -26,3 +26,4 @@ public interface Radioactive extends ItemAttribute { Radioactivity getRadioactivity(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactivity.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactivity.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactivity.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactivity.java index 1025e1e073..7a11078174 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactivity.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Radioactivity.java @@ -1,8 +1,8 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.armor.RadiationTask; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.armor.RadiationTask; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -85,3 +85,4 @@ public int getRadiationLevel() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RandomMobDrop.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RandomMobDrop.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RandomMobDrop.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RandomMobDrop.java index a0e51fe32d..1ae088b663 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RandomMobDrop.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RandomMobDrop.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDeathEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.BasicCircuitBoard; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.MobDropListener; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.BasicCircuitBoard; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.MobDropListener; /** * This interface, when attached to a {@link SlimefunItem}, provides an easy method for adding @@ -33,3 +33,4 @@ public interface RandomMobDrop extends ItemAttribute { int getMobDropChance(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Rechargeable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Rechargeable.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Rechargeable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Rechargeable.java index e76348c62f..a752f9d055 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Rechargeable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Rechargeable.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Jetpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.MultiTool; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ChargingBench; -import io.github.thebusybiscuit.slimefun4.utils.ChargeUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Jetpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.MultiTool; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ChargingBench; +import io.github.thebusybiscuit.slimefun5.utils.ChargeUtils; /** * A {@link Rechargeable} {@link SlimefunItem} can hold energy and is able to @@ -148,3 +148,4 @@ default boolean removeItemCharge(ItemStack item, float charge) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RecipeDisplayItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RecipeDisplayItem.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RecipeDisplayItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RecipeDisplayItem.java index c85cce7f3f..8eca9e7e22 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/RecipeDisplayItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/RecipeDisplayItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import java.util.List; @@ -7,11 +7,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; @@ -53,3 +53,4 @@ default String getRecipeSectionLabel(@Nonnull Player p) { return "&7\u21E9 " + Slimefun.getLocalization().getMessage(p, getLabelLocalPath()) + " \u21E9"; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Soulbound.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Soulbound.java similarity index 62% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Soulbound.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Soulbound.java index c8ddd7fbba..8012a2e777 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Soulbound.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/Soulbound.java @@ -1,7 +1,7 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.SoulboundItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.SoulboundItem; /** * This Interface, when attached to a class that inherits from {@link SlimefunItem}, marks @@ -16,3 +16,4 @@ public interface Soulbound extends ItemAttribute { } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/WitherProof.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/WitherProof.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/WitherProof.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/WitherProof.java index 712f0df3ea..984f7483f2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/WitherProof.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/WitherProof.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes; +package io.github.thebusybiscuit.slimefun5.core.attributes; import javax.annotation.Nonnull; import org.bukkit.block.Block; import org.bukkit.entity.Wither; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.WitherProofBlock; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.WitherProofBlock; /** * This Interface, when attached to a class that inherits from {@link SlimefunItem}, marks @@ -32,3 +32,4 @@ public interface WitherProof extends ItemAttribute { void onAttack(@Nonnull Block block, @Nonnull Wither wither); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/InteractionResult.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/InteractionResult.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/InteractionResult.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/InteractionResult.java index d0b36ae606..fc0b01e643 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/InteractionResult.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/InteractionResult.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes.interactions; +package io.github.thebusybiscuit.slimefun5.core.attributes.interactions; -import io.github.thebusybiscuit.slimefun4.core.attributes.ExternallyInteractable; +import io.github.thebusybiscuit.slimefun5.core.attributes.ExternallyInteractable; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -59,3 +59,4 @@ public boolean hasResultMessage() { return resultMessage; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/ItemInteractionResult.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/ItemInteractionResult.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/ItemInteractionResult.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/ItemInteractionResult.java index 3d93ffaf01..beb43b6a28 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/interactions/ItemInteractionResult.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/ItemInteractionResult.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.core.attributes.interactions; +package io.github.thebusybiscuit.slimefun5.core.attributes.interactions; -import io.github.thebusybiscuit.slimefun4.core.attributes.ExternallyInteractable; +import io.github.thebusybiscuit.slimefun5.core.attributes.ExternallyInteractable; import org.bukkit.inventory.ItemStack; import javax.annotation.Nonnull; @@ -62,3 +62,4 @@ public boolean resultedInItems() { return Collections.unmodifiableSet(resultItems); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/package-info.java new file mode 100644 index 0000000000..29fe78e62b --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/interactions/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains the various possible {@link io.github.thebusybiscuit.slimefun5.core.attributes.interactions.InteractionResult}s + * that can be returned by an {@link io.github.thebusybiscuit.slimefun5.core.attributes.ExternallyInteractable} object. + */ +package io.github.thebusybiscuit.slimefun5.core.attributes.interactions; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/package-info.java new file mode 100644 index 0000000000..1e7c9d7be7 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/attributes/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains all variations of {@link io.github.thebusybiscuit.slimefun5.core.attributes.ItemAttribute} that + * can be assigned to a {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + */ +package io.github.thebusybiscuit.slimefun5.core.attributes; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunCommand.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunCommand.java index 4ef1a411a5..cbb1b45c97 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import java.util.HashMap; import java.util.LinkedList; @@ -17,8 +17,8 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.core.commands.subcommands.SlimefunSubCommands; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.subcommands.SlimefunSubCommands; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link CommandExecutor} holds the functionality of our {@code /slimefun} command. @@ -124,3 +124,4 @@ public void onCommand(PlayerCommandPreprocessEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunTabCompleter.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunTabCompleter.java index 50a665f308..20475b8a9c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SlimefunTabCompleter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import java.util.ArrayList; import java.util.Arrays; @@ -14,10 +14,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class SlimefunTabCompleter implements TabCompleter { @@ -114,3 +114,4 @@ private List getSlimefunItems() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SubCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SubCommand.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SubCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SubCommand.java index 4b5717a7a6..4e240a593e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SubCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/SubCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import java.util.Map; @@ -10,8 +10,8 @@ import org.bukkit.command.defaults.HelpCommand; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class represents a {@link SubCommand}, it is a {@link Command} that starts with @@ -89,3 +89,4 @@ protected String getDescription() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/package-info.java similarity index 58% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/package-info.java index 13a08a12ac..e98d3c381f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/package-info.java @@ -1,4 +1,4 @@ /** * This package contains everything related to Slimefun's ingame command. */ -package io.github.thebusybiscuit.slimefun4.core.commands; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.commands; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/BackpackCommand.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/BackpackCommand.java index 3e124b8e77..7236963a3a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/BackpackCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,12 +9,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.RestoredBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.RestoredBackpack; /** * This command that allows for backpack retrieval in the event they are lost. @@ -83,3 +83,4 @@ public void onExecute(CommandSender sender, String[] args) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ChargeCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ChargeCommand.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ChargeCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ChargeCommand.java index 119091e1e6..9aefeb6a1a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ChargeCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ChargeCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,11 +6,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * {@link ChargeCommand} adds an in game command which charges any {@link Rechargeable} @@ -52,3 +52,4 @@ public void onExecute(CommandSender sender, String[] args) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/CheatCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/CheatCommand.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/CheatCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/CheatCommand.java index 973ed1ee39..96f7406023 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/CheatCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/CheatCommand.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class CheatCommand extends SubCommand { @@ -31,3 +31,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugCommand.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugCommand.java index 12c567cb14..54bcc1ee95 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugCommand.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.Nonnull; import org.bukkit.command.CommandSender; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * The debug command will allow server owners to get information for us developers. @@ -54,3 +54,4 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugFishCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugFishCommand.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugFishCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugFishCommand.java index 7b0c85b277..704e02995e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DebugFishCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/DebugFishCommand.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; class DebugFishCommand extends SubCommand { @@ -27,3 +27,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GiveCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GiveCommand.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GiveCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GiveCommand.java index cdf67f5bab..57c896294d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GiveCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GiveCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Locale; import java.util.Map; @@ -13,11 +13,11 @@ import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.common.PlayerList; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class GiveCommand extends SubCommand { @@ -94,3 +94,4 @@ private int parseAmount(String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GuideCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GuideCommand.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GuideCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GuideCommand.java index 006744d6c7..ce4d82adf8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/GuideCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/GuideCommand.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class GuideCommand extends SubCommand { @@ -33,3 +33,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/HelpCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/HelpCommand.java similarity index 62% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/HelpCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/HelpCommand.java index b3e411d388..f6c8d3dafc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/HelpCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/HelpCommand.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.command.CommandSender; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class HelpCommand extends SubCommand { @@ -21,3 +21,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/OpenGuideCommand.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/OpenGuideCommand.java index 83db842925..df1cc43d30 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/OpenGuideCommand.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class OpenGuideCommand extends SubCommand { @@ -33,3 +33,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ResearchCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ResearchCommand.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ResearchCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ResearchCommand.java index 8b81c87b53..1315a982a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/ResearchCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/ResearchCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Optional; import java.util.function.UnaryOperator; @@ -10,11 +10,11 @@ import org.bukkit.entity.Player; import io.github.bakedlibs.dough.common.PlayerList; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class ResearchCommand extends SubCommand { @@ -117,3 +117,4 @@ private Optional getResearchFromString(@Nonnull String input) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SearchCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SearchCommand.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SearchCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SearchCommand.java index 9783518b17..f67c31062a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SearchCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SearchCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Arrays; @@ -7,12 +7,12 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class SearchCommand extends SubCommand { @@ -40,3 +40,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SlimefunSubCommands.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SlimefunSubCommands.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SlimefunSubCommands.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SlimefunSubCommands.java index 17d70bce3e..f90beefac6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SlimefunSubCommands.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/SlimefunSubCommands.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Collection; import java.util.LinkedList; @@ -6,9 +6,9 @@ import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class holds the implementations of every {@link SubCommand}. @@ -46,3 +46,4 @@ public static Collection getAllCommands(@Nonnull SlimefunCommand cmd return commands; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/StatsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/StatsCommand.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/StatsCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/StatsCommand.java index cb9069eb6a..bcbe38d771 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/StatsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/StatsCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Optional; @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; import io.github.bakedlibs.dough.common.PlayerList; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class StatsCommand extends SubCommand { @@ -49,3 +49,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TeleporterCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TeleporterCommand.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TeleporterCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TeleporterCommand.java index 891ba85059..98cab05018 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TeleporterCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TeleporterCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,9 +8,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class TeleporterCommand extends SubCommand { @@ -47,3 +47,4 @@ public void onExecute(CommandSender sender, String[] args) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TimingsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TimingsCommand.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TimingsCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TimingsCommand.java index 3dfd8a78cc..8b5540cbaa 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/TimingsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/TimingsCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Arrays; import java.util.HashSet; @@ -12,13 +12,13 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.core.services.profiler.PerformanceInspector; -import io.github.thebusybiscuit.slimefun4.core.services.profiler.SummaryOrderType; -import io.github.thebusybiscuit.slimefun4.core.services.profiler.inspectors.ConsolePerformanceInspector; -import io.github.thebusybiscuit.slimefun4.core.services.profiler.inspectors.PlayerPerformanceInspector; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.core.services.profiler.PerformanceInspector; +import io.github.thebusybiscuit.slimefun5.core.services.profiler.SummaryOrderType; +import io.github.thebusybiscuit.slimefun5.core.services.profiler.inspectors.ConsolePerformanceInspector; +import io.github.thebusybiscuit.slimefun5.core.services.profiler.inspectors.PlayerPerformanceInspector; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class TimingsCommand extends SubCommand { @@ -106,3 +106,4 @@ private PerformanceInspector inspectorOf(CommandSender sender, boolean verbose, } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/VersionsCommand.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/VersionsCommand.java index 34ff1f4a20..53ca9c9277 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/VersionsCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; import java.util.Collection; @@ -10,11 +10,11 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; -import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.core.commands.SlimefunCommand; +import io.github.thebusybiscuit.slimefun5.core.commands.SubCommand; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import io.papermc.lib.PaperLib; import net.md_5.bungee.api.ChatColor; @@ -209,3 +209,4 @@ private void addPluginVersions(@Nonnull ComponentBuilder builder) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/package-info.java similarity index 51% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/package-info.java index c1b87ef5c7..ee7c7989df 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/commands/subcommands/package-info.java @@ -1,5 +1,5 @@ /** - * This package holds all implementations of {@link io.github.thebusybiscuit.slimefun4.core.commands.SubCommand}. + * This package holds all implementations of {@link io.github.thebusybiscuit.slimefun5.core.commands.SubCommand}. * You can find all sub commands of Slimefun in here. */ -package io.github.thebusybiscuit.slimefun4.core.commands.subcommands; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.commands.subcommands; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/Debug.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/Debug.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/Debug.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/Debug.java index 50a05c309e..d3cbbde4c2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/Debug.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/Debug.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.debug; +package io.github.thebusybiscuit.slimefun5.core.debug; import java.util.logging.Level; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class is responsible for debug logging. @@ -132,3 +132,4 @@ public static void setTestCase(@Nullable String test) { return testCase; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/TestCase.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/TestCase.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/TestCase.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/TestCase.java index e41ecddc42..73c9587ca1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/TestCase.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/TestCase.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.debug; +package io.github.thebusybiscuit.slimefun5.core.debug; import java.util.Arrays; import java.util.List; @@ -6,7 +6,7 @@ import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.core.services.AnalyticsService; +import io.github.thebusybiscuit.slimefun5.core.services.AnalyticsService; /** * Test cases in Slimefun. These are very useful for debugging why behavior is happening. @@ -43,3 +43,4 @@ public enum TestCase { return "slimefun_" + name().toLowerCase(Locale.ROOT); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/package-info.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/package-info.java index 57ef3809c0..edf4d6cf53 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/debug/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/debug/package-info.java @@ -2,4 +2,4 @@ * This package holds the debug functionality of Slimefun, these can be used as addons but are mostly just * going to be used by Slimefun itself. */ -package io.github.thebusybiscuit.slimefun4.core.debug; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.debug; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideEntry.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideEntry.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideEntry.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideEntry.java index 14f65fd071..60d698ddbf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideEntry.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideEntry.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; import javax.annotation.Nonnull; @@ -26,3 +26,4 @@ public void setPage(int page) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideHistory.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideHistory.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideHistory.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideHistory.java index d84adcfee2..6526db04f1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideHistory.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/GuideHistory.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; import java.util.Deque; import java.util.LinkedList; @@ -10,9 +10,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; /** * {@link GuideHistory} represents the browsing history of a {@link Player} through the @@ -202,3 +202,4 @@ private void open(@Nonnull SlimefunGuideImplementation guide, @Nullable Guid } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuide.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuide.java index 91f70a6c80..3d0c593b8b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuide.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; import java.util.Optional; @@ -10,13 +10,13 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.SlimefunGuideItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.SlimefunGuideItem; /** * This is a static utility class that provides convenient access to the methods @@ -131,3 +131,4 @@ public static SlimefunGuideMode getDefaultMode() { return SlimefunGuideMode.SURVIVAL_MODE; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideImplementation.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideImplementation.java index d035715ed7..6717171a93 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideImplementation.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; import java.util.function.Consumer; @@ -9,13 +9,13 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.guide.options.SlimefunGuideSettings; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.guide.options.SlimefunGuideSettings; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; /** * This interface is used for the different implementations that add behaviour @@ -78,3 +78,4 @@ default void unlockItem(Player p, SlimefunItem sfitem, Consumer callback } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideMode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideMode.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideMode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideMode.java index 5b269f96e4..0c1355ed9b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideMode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/SlimefunGuideMode.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This enum holds the different designs a {@link SlimefunGuide} can have. @@ -26,3 +26,4 @@ public enum SlimefunGuideMode { CHEAT_MODE; } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/ContributorsMenu.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/ContributorsMenu.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/ContributorsMenu.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/ContributorsMenu.java index 06d06c3379..6b36d2dc2f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/ContributorsMenu.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/ContributorsMenu.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.ArrayList; import java.util.Comparator; @@ -13,12 +13,12 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.core.services.github.Contributor; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.services.github.Contributor; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -127,3 +127,4 @@ private static ItemStack getContributorHead(Player p, Contributor contributor) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/FireworksOption.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/FireworksOption.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/FireworksOption.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/FireworksOption.java index d16b85a170..3ca07e745b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/FireworksOption.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/FireworksOption.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.List; import java.util.Optional; @@ -10,9 +10,9 @@ import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.core.SlimefunRegistry; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class FireworksOption implements SlimefunGuideOption { @@ -64,3 +64,4 @@ public void setSelectedOption(Player p, ItemStack guide, Boolean value) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideModeOption.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/GuideModeOption.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideModeOption.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/GuideModeOption.java index 92ede97bc9..b9e6f19d27 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideModeOption.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/GuideModeOption.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.ArrayList; import java.util.List; @@ -14,12 +14,12 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; class GuideModeOption implements SlimefunGuideOption { @@ -116,3 +116,4 @@ public void setSelectedOption(Player p, ItemStack guide, SlimefunGuideMode value } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/LearningAnimationOption.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/LearningAnimationOption.java index ee62bbbf07..eceb96ca07 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/LearningAnimationOption.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.List; import java.util.Optional; @@ -12,9 +12,9 @@ import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.core.SlimefunRegistry; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * {@link LearningAnimationOption} represents a setting in the Slimefun guide book. @@ -75,3 +75,4 @@ public void setSelectedOption(@Nonnull Player p, @Nonnull ItemStack guide, @Nonn } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/PlayerLanguageOption.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/PlayerLanguageOption.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/PlayerLanguageOption.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/PlayerLanguageOption.java index 8633f17a54..c61e1b34d9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/PlayerLanguageOption.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/PlayerLanguageOption.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.ArrayList; import java.util.List; @@ -11,15 +11,15 @@ import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerLanguageChangeEvent; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerLanguageChangeEvent; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -89,7 +89,7 @@ private void openLanguageSelection(Player p, ItemStack guide) { }); } else if (i == 7) { menu.addItem(7, CustomItemStack.create(SlimefunUtils.getCustomHead(HeadTexture.ADD_NEW_LANGUAGE.getTexture()), Slimefun.getLocalization().getMessage(p, "guide.languages.translations.name"), "", "&7\u21E8 &e" + Slimefun.getLocalization().getMessage(p, "guide.languages.translations.lore")), (pl, slot, item, action) -> { - ChatUtils.sendURL(pl, "https://github.com/Slimefun/Slimefun4/wiki/Translating-Slimefun"); + ChatUtils.sendURL(pl, "https://github.com/Slimefun5/Slimefun5/wiki/Translating-Slimefun"); pl.closeInventory(); return false; }); @@ -132,3 +132,4 @@ private void openLanguageSelection(Player p, ItemStack guide) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideOption.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideOption.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideOption.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideOption.java index 1caeb02826..1558cc789d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideOption.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideOption.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.Optional; @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; /** * This interface represents an option in the {@link SlimefunGuide}. @@ -38,3 +38,4 @@ public interface SlimefunGuideOption extends Keyed { void setSelectedOption(Player p, ItemStack guide, T value); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideSettings.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideSettings.java index a1e310e4fc..a741329cf6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/SlimefunGuideSettings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/SlimefunGuideSettings.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.guide.options; +package io.github.thebusybiscuit.slimefun5.core.guide.options; import java.util.ArrayList; import java.util.List; @@ -14,18 +14,18 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; -import io.github.thebusybiscuit.slimefun4.core.services.github.GitHubService; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.services.LocalizationService; +import io.github.thebusybiscuit.slimefun5.core.services.github.GitHubService; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -136,7 +136,7 @@ private static void addHeader(Player p, ChestMenu menu, ItemStack guide) { menu.addMenuClickHandler(6, (pl, slot, item, action) -> { pl.closeInventory(); - ChatUtils.sendURL(pl, "https://github.com/Slimefun/Slimefun4"); + ChatUtils.sendURL(pl, "https://github.com/Slimefun5/Slimefun5"); return false; }); @@ -153,7 +153,7 @@ private static void addHeader(Player p, ChestMenu menu, ItemStack guide) { menu.addMenuClickHandler(8, (pl, slot, item, action) -> { pl.closeInventory(); - ChatUtils.sendURL(pl, "https://github.com/Slimefun/Slimefun4/wiki"); + ChatUtils.sendURL(pl, "https://github.com/Slimefun5/Slimefun5/wiki"); return false; }); @@ -167,12 +167,12 @@ private static void addHeader(Player p, ChestMenu menu, ItemStack guide) { "", "&7Installed on this Server: &b" + Slimefun.getInstalledAddons().size(), "", - "&7\u21E8 &eClick to see all available addons for Slimefun4")); + "&7\u21E8 &eClick to see all available addons for Slimefun5")); // @formatter:on menu.addMenuClickHandler(47, (pl, slot, item, action) -> { pl.closeInventory(); - ChatUtils.sendURL(pl, "https://github.com/Slimefun/Slimefun4/wiki/Addons"); + ChatUtils.sendURL(pl, "https://github.com/Slimefun5/Slimefun5/wiki/Addons"); return false; }); @@ -186,12 +186,12 @@ private static void addHeader(Player p, ChestMenu menu, ItemStack guide) { "&7Open Issues: &a" + github.getOpenIssues(), "&7Pending Pull Requests: &a" + github.getPendingPullRequests(), "", - "&7\u21E8 &eClick to go to the Slimefun4 Bug Tracker")); + "&7\u21E8 &eClick to go to the Slimefun5 Bug Tracker")); // @formatter:on menu.addMenuClickHandler(49, (pl, slot, item, action) -> { pl.closeInventory(); - ChatUtils.sendURL(pl, "https://github.com/Slimefun/Slimefun4/issues"); + ChatUtils.sendURL(pl, "https://github.com/Slimefun5/Slimefun5/issues"); return false; }); } else { @@ -282,3 +282,4 @@ private static , V> V getOptionValue(@Nonnull P } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/package-info.java new file mode 100644 index 0000000000..4371090077 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/options/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains the Settings menu for the {@link io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide} as + * well as the interface {@link io.github.thebusybiscuit.slimefun5.core.guide.options.SlimefunGuideOption} for adding + * your own options + */ +package io.github.thebusybiscuit.slimefun5.core.guide.options; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/package-info.java similarity index 61% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/package-info.java index 0d47912f05..37c14ffb66 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/guide/package-info.java @@ -1,5 +1,5 @@ /** - * This package contains the core system for the {@link io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide}. + * This package contains the core system for the {@link io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide}. * Note that you can find the individual implementations of the guide, in the implementation package */ -package io.github.thebusybiscuit.slimefun4.core.guide; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.guide; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockBreakHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockBreakHandler.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockBreakHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockBreakHandler.java index 7bd704a509..6b8ce367c0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockBreakHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockBreakHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.List; @@ -10,10 +10,10 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidMineEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.MinerAndroid; +import io.github.thebusybiscuit.slimefun5.api.events.AndroidMineEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.MinerAndroid; /** * The {@link BlockBreakHandler} is called when a {@link Block} is broken @@ -102,3 +102,4 @@ public final Class getIdentifier() { return BlockBreakHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockDispenseHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockDispenseHandler.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockDispenseHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockDispenseHandler.java index 8f10c0fa97..cd9512179a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockDispenseHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockDispenseHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.Optional; @@ -7,11 +7,11 @@ import org.bukkit.block.Dispenser; import org.bukkit.event.block.BlockDispenseEvent; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer; /** * This {@link ItemHandler} is triggered when the {@link SlimefunItem} it was assigned to @@ -44,3 +44,4 @@ default Class getIdentifier() { return BlockDispenseHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockPlaceHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockPlaceHandler.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockPlaceHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockPlaceHandler.java index e2cb771bfc..84300637a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockPlaceHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockPlaceHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import javax.annotation.Nonnull; @@ -6,10 +6,10 @@ import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer; /** * This {@link ItemHandler} is called whenever a {@link Block} was placed. @@ -62,3 +62,4 @@ public final Class getIdentifier() { return BlockPlaceHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockUseHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockUseHandler.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockUseHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockUseHandler.java index 0aeac6f4a9..f2cb7d8e1c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BlockUseHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BlockUseHandler.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.Optional; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; @FunctionalInterface public interface BlockUseHandler extends ItemHandler { @@ -28,3 +28,4 @@ default Class getIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BowShootHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BowShootHandler.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BowShootHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BowShootHandler.java index f2c5aa7df0..9d64cdf76f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/BowShootHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/BowShootHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.Optional; @@ -6,10 +6,10 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SlimefunBow; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SlimefunBow; /** * This {@link ItemHandler} is triggered when the {@link SlimefunItem} it was assigned to @@ -40,3 +40,4 @@ default Class getIdentifier() { return BowShootHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityInteractHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityInteractHandler.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityInteractHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityInteractHandler.java index 1091d3a335..1b8e51aeba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityInteractHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityInteractHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -7,10 +7,10 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.EntityInteractionListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.EntityInteractionListener; /** * This is triggered when a {@link Player} interacts with an {@link Entity}. @@ -42,4 +42,4 @@ public interface EntityInteractHandler extends ItemHandler { default Class getIdentifier() { return EntityInteractHandler.class; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityKillHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityKillHandler.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityKillHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityKillHandler.java index 21ec3c0179..9f39498ec0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/EntityKillHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/EntityKillHandler.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * If this {@link ItemHandler} is added to a {@link SlimefunItem} it will listen @@ -30,3 +30,4 @@ default Class getIdentifier() { return EntityKillHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/GlobalItemHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/GlobalItemHandler.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/GlobalItemHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/GlobalItemHandler.java index df5f0a92e7..8a0451cfa0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/GlobalItemHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/GlobalItemHandler.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import org.bukkit.event.Event; import org.bukkit.event.Listener; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * A {@link GlobalItemHandler} is a special type of {@link ItemHandler} @@ -19,3 +19,4 @@ public interface GlobalItemHandler extends ItemHandler { } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemConsumptionHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemConsumptionHandler.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemConsumptionHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemConsumptionHandler.java index 69a5d44089..51de762a26 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemConsumptionHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemConsumptionHandler.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.DietCookie; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.FortuneCookie; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.DietCookie; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.FortuneCookie; /** * This {@link ItemHandler} is triggered when the {@link SlimefunItem} it was assigned to @@ -47,3 +47,4 @@ default Class getIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemDropHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemDropHandler.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemDropHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemDropHandler.java index a0e6efbb6a..464aa4600e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemDropHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemDropHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerDropItemEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; /** * The {@link ItemDropHandler} is a {@link GlobalItemHandler} which listens to @@ -27,3 +27,4 @@ default Class getIdentifier() { return ItemDropHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemUseHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemUseHandler.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemUseHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemUseHandler.java index e0ef00c672..99edbee5f6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ItemUseHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ItemUseHandler.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This {@link ItemHandler} is triggered when the {@link SlimefunItem} it was assigned to @@ -35,3 +35,4 @@ default Class getIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/MultiBlockInteractionHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/MultiBlockInteractionHandler.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/MultiBlockInteractionHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/MultiBlockInteractionHandler.java index 0ae90600bd..2d4e2c836a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/MultiBlockInteractionHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/MultiBlockInteractionHandler.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.Optional; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; /** * This {@link ItemHandler} is called whenever a {@link Player} interacts with @@ -43,3 +43,4 @@ default Class getIdentifier() { return MultiBlockInteractionHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/RainbowTickHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/RainbowTickHandler.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/RainbowTickHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/RainbowTickHandler.java index 6fa656f6d0..a5e44a7231 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/RainbowTickHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/RainbowTickHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.Arrays; import java.util.List; @@ -13,11 +13,11 @@ import org.bukkit.block.data.type.GlassPane; import io.github.bakedlibs.dough.collections.LoopIterator; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RainbowBlock; -import io.github.thebusybiscuit.slimefun4.utils.ColoredMaterial; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RainbowBlock; +import io.github.thebusybiscuit.slimefun5.utils.ColoredMaterial; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -132,3 +132,4 @@ public boolean isSynchronized() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ToolUseHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ToolUseHandler.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ToolUseHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ToolUseHandler.java index 579b5f5749..59cad0bf48 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/ToolUseHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/ToolUseHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import java.util.List; @@ -7,8 +7,8 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This {@link ItemHandler} is called when a {@link Block} is broken with a {@link SlimefunItem} @@ -43,3 +43,4 @@ default Class getIdentifier() { return ToolUseHandler.class; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/WeaponUseHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/WeaponUseHandler.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/WeaponUseHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/WeaponUseHandler.java index 99fda746be..426c78eac4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/WeaponUseHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/WeaponUseHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.handlers; +package io.github.thebusybiscuit.slimefun5.core.handlers; import javax.annotation.Nonnull; @@ -7,8 +7,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This is triggered when a {@link Player} attacks an {@link Entity}. @@ -37,3 +37,4 @@ default Class getIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/package-info.java similarity index 50% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/package-info.java index d3c439ec1e..a60e6043da 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/handlers/package-info.java @@ -1,5 +1,5 @@ /** - * This package contains all variations of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemHandler} that - * can be assigned to a {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} + * This package contains all variations of {@link io.github.thebusybiscuit.slimefun5.api.items.ItemHandler} that + * can be assigned to a {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} */ -package io.github.thebusybiscuit.slimefun4.core.handlers; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.handlers; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineOperation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineOperation.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineOperation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineOperation.java index 3da6569b6c..0e9f08185d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineOperation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineOperation.java @@ -1,7 +1,7 @@ -package io.github.thebusybiscuit.slimefun4.core.machines; +package io.github.thebusybiscuit.slimefun5.core.machines; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineProcessHolder; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineProcessHolder; /** * This represents a {@link MachineOperation} which is handled @@ -65,3 +65,4 @@ default boolean isFinished() { default void onCancel(BlockPosition position) {} } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineProcessor.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineProcessor.java index 9ec92b578a..3d11393d81 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/MachineProcessor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.machines; +package io.github.thebusybiscuit.slimefun5.core.machines; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -14,9 +14,9 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.api.events.AsyncMachineOperationFinishEvent; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineProcessHolder; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.events.AsyncMachineOperationFinishEvent; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineProcessHolder; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -259,3 +259,4 @@ public void updateProgressBar(@Nonnull BlockMenu inv, int slot, @Nonnull T opera } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/package-info.java new file mode 100644 index 0000000000..17cac4c7e2 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/machines/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains sources related to the + * {@link io.github.thebusybiscuit.slimefun5.core.machines.MachineProcessor} + * and any {@link io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation}. + */ +package io.github.thebusybiscuit.slimefun5.core.machines; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlock.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlock.java index 4175b20527..44cd4137eb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlock.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.multiblocks; +package io.github.thebusybiscuit.slimefun5.core.multiblocks; import java.util.Arrays; import java.util.HashSet; @@ -14,9 +14,9 @@ import org.bukkit.World; import org.bukkit.block.BlockFace; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockInteractEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.MultiBlockInteractionHandler; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockInteractEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.MultiBlockInteractionHandler; /** * A {@link MultiBlock} represents a structure build in a {@link World}. @@ -154,3 +154,4 @@ public String toString() { return "MultiBlock (" + item.getId() + ") {" + Arrays.toString(blocks) + "}"; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlockMachine.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlockMachine.java index d18f6ba2cd..2d66ee52d5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/MultiBlockMachine.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.multiblocks; +package io.github.thebusybiscuit.slimefun5.core.multiblocks; import java.util.ArrayList; import java.util.Arrays; @@ -25,18 +25,18 @@ import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.MultiBlockInteractionHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.OutputChest; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.MultiBlockInteractionHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.OutputChest; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * A {@link MultiBlockMachine} is a {@link SlimefunItem} that is built in the {@link World}. @@ -224,3 +224,4 @@ protected void handleCraftedItem(ItemStack outputItem, Block block, Inventory bl } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/package-info.java new file mode 100644 index 0000000000..569eb1026e --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds all core mechanics related to a + * {@link io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock}, like that class itself. + */ +package io.github.thebusybiscuit.slimefun5.core.multiblocks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/NetworkManager.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/NetworkManager.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/NetworkManager.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/NetworkManager.java index 14d88e121d..29cff5ab22 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/NetworkManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/NetworkManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks; +package io.github.thebusybiscuit.slimefun5.core.networks; import java.util.ArrayList; import java.util.Collections; @@ -16,11 +16,11 @@ import io.github.bakedlibs.dough.blocks.BlockPosition; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.NetworkListener; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.NetworkListener; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -215,3 +215,4 @@ public void updateAllNetworks(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/AbstractItemNetwork.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/AbstractItemNetwork.java index 2cce2bb796..65f29b7153 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/AbstractItemNetwork.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import java.util.HashMap; import java.util.List; @@ -17,9 +17,9 @@ import org.bukkit.block.data.Directional; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; @@ -133,3 +133,4 @@ private void filter(@Nullable ItemStack stack, List items, } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNet.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNet.java index 7ef1da5cdb..f07cb380bf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNet.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import java.util.HashMap; import java.util.HashSet; @@ -17,10 +17,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.api.network.NetworkComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.api.network.NetworkComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -230,3 +230,4 @@ private static int getFrequency(@Nonnull Location node) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNetworkTask.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNetworkTask.java index 35b5fe225f..5ab3f0cc53 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoNetworkTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import java.util.ArrayDeque; import java.util.ArrayList; @@ -20,13 +20,13 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -212,3 +212,4 @@ private void roundRobinSort(int index, Deque outputNodes) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoUtils.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoUtils.java index ff8da96d0a..26bd9815a1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/CargoUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import java.util.Map; @@ -17,12 +17,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -422,3 +422,4 @@ public static int[] getFilteringSlots() { return FILTER_SLOTS; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemFilter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemFilter.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemFilter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemFilter.java index 1de4b4a4a4..8fe3f9a076 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemFilter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemFilter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import java.util.ArrayList; import java.util.List; @@ -11,12 +11,12 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoNode; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoNode; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -216,3 +216,4 @@ public boolean test(@Nonnull ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemStackAndInteger.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemStackAndInteger.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemStackAndInteger.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemStackAndInteger.java index d149efdc79..21884d6981 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ItemStackAndInteger.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/ItemStackAndInteger.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; import javax.annotation.Nonnull; import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; class ItemStackAndInteger { @@ -51,3 +51,4 @@ private void initializeItem() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/package-info.java similarity index 53% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/package-info.java index 96c7abbb70..271b90b7f4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/cargo/package-info.java @@ -1,5 +1,5 @@ /** - * This package holds an implementation of {@link io.github.thebusybiscuit.slimefun4.api.network.Network} + * This package holds an implementation of {@link io.github.thebusybiscuit.slimefun5.api.network.Network} * that is responsible for item transportation. */ -package io.github.thebusybiscuit.slimefun4.core.networks.cargo; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.networks.cargo; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNet.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNet.java index cb7c2c910c..2a1580bb68 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNet.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.energy; +package io.github.thebusybiscuit.slimefun5.core.networks.energy; import java.util.Collections; import java.util.HashMap; @@ -16,16 +16,16 @@ import org.bukkit.Material; import org.bukkit.block.Block; -import io.github.thebusybiscuit.slimefun4.api.ErrorReport; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.api.network.NetworkComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.ErrorReport; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.api.network.NetworkComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetProvider; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -345,3 +345,4 @@ public static EnergyNet getNetworkFromLocationOrCreate(@Nonnull Location l) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNetComponentType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNetComponentType.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNetComponentType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNetComponentType.java index 8340260dcb..b259585096 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNetComponentType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/EnergyNetComponentType.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.networks.energy; +package io.github.thebusybiscuit.slimefun5.core.networks.energy; import org.bukkit.block.Block; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.Capacitor; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.EnergyConnector; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.Capacitor; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.EnergyConnector; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; @@ -53,4 +53,4 @@ public enum EnergyNetComponentType { */ NONE; -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/package-info.java similarity index 52% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/package-info.java index d5061d1036..0b47fe310e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/energy/package-info.java @@ -1,5 +1,5 @@ /** - * This package holds an implementation of {@link io.github.thebusybiscuit.slimefun4.api.network.Network} + * This package holds an implementation of {@link io.github.thebusybiscuit.slimefun5.api.network.Network} * that is responsible for transmitting energy. */ -package io.github.thebusybiscuit.slimefun4.core.networks.energy; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.networks.energy; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/package-info.java new file mode 100644 index 0000000000..6ba1db6ba6 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/networks/package-info.java @@ -0,0 +1,6 @@ +/** + * This package provides the core functionality for the {@link io.github.thebusybiscuit.slimefun5.api.network.Network} + * class, such as the {@link io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager} and also the subpackages + * for actual implementations of the {@link io.github.thebusybiscuit.slimefun5.api.network.Network} class. + */ +package io.github.thebusybiscuit.slimefun5.core.networks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/package-info.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/package-info.java index 4a303ab0e0..4a588050a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/package-info.java @@ -2,4 +2,4 @@ * This package holds the core systems of Slimefun, these are not necessarily used as an API * but rather provide the core functionality of this {@link org.bukkit.plugin.Plugin}. */ -package io.github.thebusybiscuit.slimefun4.core; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AnalyticsService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AnalyticsService.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AnalyticsService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AnalyticsService.java index b0afd40657..f054672558 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AnalyticsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AnalyticsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.net.URI; import java.net.http.HttpClient; @@ -15,9 +15,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class represents an analytics service that sends data. @@ -143,7 +143,7 @@ private void send(String id, double[] doubles, String[] blobs) { // Send async, we do not care about the result. If it fails, that's fine. client.sendAsync(HttpRequest.newBuilder() .uri(URI.create(API_URL)) - .header("User-Agent", "Mozilla/5.0 Slimefun4 AnalyticsService") + .header("User-Agent", "Mozilla/5.0 Slimefun5 AnalyticsService") .POST(HttpRequest.BodyPublishers.ofString(object.toString())) .build(), HttpResponse.BodyHandlers.discarding() @@ -156,3 +156,4 @@ private void send(String id, double[] doubles, String[] blobs) { }); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AutoSavingService.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AutoSavingService.java index 060ce0d772..65b0733179 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/AutoSavingService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.HashSet; import java.util.Iterator; @@ -12,10 +12,10 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -115,3 +115,4 @@ private void saveAllBlocks() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BackupService.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BackupService.java index 80ce5b999b..e29637da9f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BackupService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; import java.io.FileInputStream; @@ -19,7 +19,7 @@ import org.apache.commons.lang.Validate; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This Service creates a Backup of your Slimefun world data on every server shutdown. @@ -149,3 +149,4 @@ private void purgeBackups(@Nonnull List backups) throws IOException { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BlockDataService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BlockDataService.java index 69c9579286..9d21e1ed26 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/BlockDataService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Optional; import java.util.logging.Level; @@ -6,7 +6,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Keyed; @@ -20,7 +20,7 @@ import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import io.papermc.lib.PaperLib; /** @@ -141,4 +141,4 @@ public boolean isTileEntity(@Nullable Material type) { return SlimefunTag.TILE_ENTITIES.isTagged(type); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomItemDataService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomItemDataService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomItemDataService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomItemDataService.java index e9617b7eec..ac4d521f76 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomItemDataService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomItemDataService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Optional; @@ -15,8 +15,8 @@ import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.Plugin; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; /** * This Service is responsible for applying NBT data to a {@link SlimefunItemStack}. @@ -159,3 +159,4 @@ public boolean hasEqualItemData(@Nonnull ItemMeta meta1, @Nonnull ItemMeta meta2 } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomTextureService.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomTextureService.java index 7c84a1de2a..6fd211f937 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/CustomTextureService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.BufferedReader; import java.io.InputStream; @@ -17,9 +17,9 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This Service is responsible for applying custom model data to any {@link SlimefunItemStack} @@ -171,3 +171,4 @@ public void setTexture(@Nonnull ItemMeta im, @Nonnull String id) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/LocalizationService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/LocalizationService.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/LocalizationService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/LocalizationService.java index 39b533335a..429ff896b3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/LocalizationService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/LocalizationService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.BufferedReader; import java.io.IOException; @@ -26,12 +26,12 @@ import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; -import io.github.thebusybiscuit.slimefun4.core.services.localization.Language; -import io.github.thebusybiscuit.slimefun4.core.services.localization.LanguageFile; -import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import io.github.thebusybiscuit.slimefun5.core.services.localization.Language; +import io.github.thebusybiscuit.slimefun5.core.services.localization.LanguageFile; +import io.github.thebusybiscuit.slimefun5.core.services.localization.SlimefunLocalization; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.PatternUtils; /** * As the name suggests, this Service is responsible for Localization. @@ -282,3 +282,4 @@ public double calculateProgress(@Nonnull Language lang) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MetricsService.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MetricsService.java index 1c6d456692..a2575ba0e6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MetricsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; import java.io.IOException; @@ -31,8 +31,8 @@ import com.google.gson.JsonParseException; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; /** * This Class represents a Metrics Service that sends data to https://bstats.org/ @@ -332,3 +332,4 @@ public CompletionStage getBody() { }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MinecraftRecipeService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MinecraftRecipeService.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MinecraftRecipeService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MinecraftRecipeService.java index c9137ed242..8fa079288c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MinecraftRecipeService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/MinecraftRecipeService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Collection; import java.util.HashMap; @@ -24,7 +24,7 @@ import io.github.bakedlibs.dough.recipes.MinecraftRecipe; import io.github.bakedlibs.dough.recipes.RecipeSnapshot; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; /** * This Service is responsible for accessing a {@link RecipeSnapshot}. @@ -196,3 +196,4 @@ public boolean isSmeltable(@Nullable ItemStack input) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PerWorldSettingsService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PerWorldSettingsService.java index a0dc615d30..90022cb034 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PerWorldSettingsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; import java.util.Collections; @@ -19,10 +19,10 @@ import io.github.bakedlibs.dough.collections.OptionalMap; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This Service is responsible for disabling a {@link SlimefunItem} in a certain {@link World}. @@ -254,3 +254,4 @@ private Config getConfig(@Nonnull World world) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PermissionsService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PermissionsService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PermissionsService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PermissionsService.java index de92df6d87..0d486a49c9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PermissionsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/PermissionsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; import java.util.Collections; @@ -16,8 +16,8 @@ import org.bukkit.permissions.Permission; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This Service is responsible for handling the {@link Permission} of a @@ -154,4 +154,4 @@ public void save() { return config.getStringList(item.getId() + ".lore"); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/ThreadService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/ThreadService.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/ThreadService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/ThreadService.java index a5aa0c58e0..3bb4cabe8d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/ThreadService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/ThreadService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -97,3 +97,4 @@ public static String getCaller() { return element.getClassName() + "." + element.getMethodName() + ":" + element.getLineNumber(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/UpdaterService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/UpdaterService.java index ac21007fce..f942dfc120 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/UpdaterService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; import java.util.concurrent.ExecutionException; @@ -12,8 +12,8 @@ import io.github.bakedlibs.dough.config.Config; import io.github.bakedlibs.dough.updater.PluginUpdater; import io.github.bakedlibs.dough.versions.PrefixedVersion; -import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.SlimefunBranch; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This Class represents our {@link PluginUpdater} Service. @@ -62,7 +62,7 @@ public UpdaterService(@Nonnull Slimefun plugin, @Nonnull String version, @Nonnul } else if (version.startsWith("Dev - ")) { // If we are using a development build, we want to switch to our custom try { - autoUpdater = new BlobBuildUpdater(plugin, file, "Slimefun4", "Dev"); + autoUpdater = new BlobBuildUpdater(plugin, file, "Slimefun5", "Dev"); } catch (Exception x) { plugin.getLogger().log(Level.SEVERE, "Failed to create AutoUpdater", x); } @@ -71,7 +71,7 @@ public UpdaterService(@Nonnull Slimefun plugin, @Nonnull String version, @Nonnul } else if (version.startsWith("RC - ")) { // If we are using a "stable" build, we want to switch to our custom try { - autoUpdater = new BlobBuildUpdater(plugin, file, "Slimefun4", "RC"); + autoUpdater = new BlobBuildUpdater(plugin, file, "Slimefun5", "RC"); } catch (Exception x) { plugin.getLogger().log(Level.SEVERE, "Failed to create AutoUpdater", x); } @@ -182,3 +182,4 @@ private void printBorder() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ActivityCallback.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ActivityCallback.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ActivityCallback.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ActivityCallback.java index e02236e392..879c588cfb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ActivityCallback.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ActivityCallback.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.time.LocalDateTime; @@ -20,3 +20,4 @@ interface ActivityCallback { void accept(int forks, int stars, @Nonnull LocalDateTime date); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributionsConnector.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributionsConnector.java index 4eb9d92637..9c19e96f0a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributionsConnector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.util.ArrayList; import java.util.HashMap; @@ -13,7 +13,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class ContributionsConnector extends GitHubConnector { @@ -138,3 +138,4 @@ private void computeContributors(@Nonnull JsonArray array) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/Contributor.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/Contributor.java index 03173056bd..ebd23a2da1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/Contributor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.util.ArrayList; import java.util.Comparator; @@ -16,8 +16,8 @@ import org.bukkit.ChatColor; import io.github.bakedlibs.dough.data.TriStateOptional; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; /** * Represents a {@link Contributor} who contributed to a GitHub repository. @@ -257,3 +257,4 @@ public int getPosition() { return -getTotalContributions(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributorRole.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributorRole.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributorRole.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributorRole.java index 3df962189c..7ce8e2b5f7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributorRole.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/ContributorRole.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import javax.annotation.Nonnull; @@ -32,3 +32,4 @@ String getId() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubActivityConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubActivityConnector.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubActivityConnector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubActivityConnector.java index 60697f1345..00ea3fc2ea 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubActivityConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubActivityConnector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.time.LocalDateTime; import java.util.HashMap; @@ -10,7 +10,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; class GitHubActivityConnector extends GitHubConnector { @@ -48,3 +48,4 @@ public Map getParameters() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubConnector.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubConnector.java index 6b7d89e1ea..7c60c5db03 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubConnector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.io.BufferedReader; import java.io.File; @@ -22,8 +22,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; /** * The {@link GitHubConnector} is used to connect to the GitHub API service. @@ -36,7 +36,7 @@ abstract class GitHubConnector { private static final String API_URL = "https://api.github.com/"; - private static final String USER_AGENT = "Slimefun4 (https://github.com/Slimefun)"; + private static final String USER_AGENT = "Slimefun5 (https://github.com/Slimefun)"; private static final HttpClient client = HttpClient.newHttpClient(); protected final GitHubService github; @@ -177,3 +177,4 @@ private void writeCacheFile(@Nonnull JsonElement node) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubIssuesConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubIssuesConnector.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubIssuesConnector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubIssuesConnector.java index 96a4237e1e..2bf4eba7a0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubIssuesConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubIssuesConnector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.util.HashMap; import java.util.Map; @@ -11,7 +11,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; class GitHubIssuesConnector extends GitHubConnector { @@ -65,3 +65,4 @@ public Map getParameters() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubService.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubService.java index 17d158d27f..bc427958ec 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.io.File; import java.time.LocalDateTime; @@ -17,8 +17,8 @@ import org.apache.commons.lang.Validate; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; /** * This Service is responsible for grabbing every {@link Contributor} to this project @@ -132,15 +132,15 @@ private void loadConnectors(boolean logging) { this.logging = logging; addDefaultContributors(); - // TheBusyBiscuit/Slimefun4 (multiple times because there may me multiple pages) + // TheBusyBiscuit/Slimefun5 (multiple times because there may me multiple pages) connectors.add(new ContributionsConnector(this, "code", 1, repository, ContributorRole.DEVELOPER)); connectors.add(new ContributionsConnector(this, "code2", 2, repository, ContributorRole.DEVELOPER)); connectors.add(new ContributionsConnector(this, "code3", 3, repository, ContributorRole.DEVELOPER)); - // TheBusyBiscuit/Slimefun4-Wiki + // TheBusyBiscuit/Slimefun5-Wiki connectors.add(new ContributionsConnector(this, "wiki", 1, "Slimefun/Wiki", ContributorRole.WIKI_EDITOR)); - // TheBusyBiscuit/Slimefun4-Resourcepack + // TheBusyBiscuit/Slimefun5-Resourcepack connectors.add(new ContributionsConnector(this, "resourcepack", 1, "Slimefun/Resourcepack", ContributorRole.RESOURCEPACK_ARTIST)); // Issues and Pull Requests @@ -202,7 +202,7 @@ public int getOpenIssues() { } /** - * Returns the id of Slimefun's GitHub Repository. (e.g. "Slimefun/Slimefun4"). + * Returns the id of Slimefun's GitHub Repository. (e.g. "Slimefun5/Slimefun5"). * * @return The id of our GitHub Repository */ @@ -262,3 +262,4 @@ protected void saveCache() { return texturesCache.getString(username); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubTask.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubTask.java index 8b065e3ff4..86513c5144 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/GitHubTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.io.File; import java.util.HashMap; @@ -16,9 +16,8 @@ import org.bukkit.Bukkit; -import io.github.bakedlibs.dough.skins.PlayerSkin; -import io.github.bakedlibs.dough.skins.UUIDLookup; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link GitHubTask} represents a {@link Runnable} that is run every X minutes. @@ -133,7 +132,7 @@ private int requestTexture(@Nonnull Contributor contributor, @Nonnull Map uuid = contributor.getUniqueId(); if (!uuid.isPresent()) { - CompletableFuture future = UUIDLookup.getUuidFromUsername(Slimefun.instance(), contributor.getMinecraftName()); + CompletableFuture future = VersionedPlayerHead.lookupUUID(contributor.getMinecraftName()); // Fixes #3241 - Do not wait for more than 30 seconds uuid = Optional.ofNullable(future.get(30, TimeUnit.SECONDS)); @@ -141,13 +140,16 @@ private int requestTexture(@Nonnull Contributor contributor, @Nonnull Map future = PlayerSkin.fromPlayerUUID(Slimefun.instance(), uuid.get()); - Optional skin = Optional.of(future.get().getProfile().getBase64Texture()); - skins.put(contributor.getMinecraftName(), skin.orElse("")); - return skin.orElse(null); + CompletableFuture future = VersionedPlayerHead.fetchSkinTexture(uuid.get()); + String texture = future.get(30, TimeUnit.SECONDS); + if (texture != null) { + skins.put(contributor.getMinecraftName(), texture); + } + return texture; } else { return null; } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/IssuesCallback.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/IssuesCallback.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/IssuesCallback.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/IssuesCallback.java index 7d32f72da8..40df098664 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/IssuesCallback.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/IssuesCallback.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; @FunctionalInterface interface IssuesCallback { @@ -14,3 +14,4 @@ interface IssuesCallback { void accept(int issues, int pullRequests); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/TranslatorsReader.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/TranslatorsReader.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/TranslatorsReader.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/TranslatorsReader.java index c6683186c0..1a7f76433c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/TranslatorsReader.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/TranslatorsReader.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.github; +package io.github.thebusybiscuit.slimefun5.core.services.github; import java.io.BufferedReader; import java.io.InputStream; @@ -14,8 +14,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; /** * This class reads all translators of this project. @@ -60,3 +60,4 @@ public void load() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/package-info.java similarity index 55% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/package-info.java index ce09970210..546a38090d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/github/package-info.java @@ -1,4 +1,4 @@ /** * This package contains everything related to GitHub and contributors. */ -package io.github.thebusybiscuit.slimefun4.core.services.github; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.core.services.github; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/Hologram.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/Hologram.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/Hologram.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/Hologram.java index b69e71d534..44c6405de5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/Hologram.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/Hologram.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.holograms; +package io.github.thebusybiscuit.slimefun5.core.services.holograms; import java.util.Objects; import java.util.UUID; @@ -133,3 +133,4 @@ void remove() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/HologramsService.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/HologramsService.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/HologramsService.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/HologramsService.java index 2673dd9b91..fc006cbe3f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/HologramsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/HologramsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.holograms; +package io.github.thebusybiscuit.slimefun5.core.services.holograms; import java.util.Collection; import java.util.HashMap; @@ -25,8 +25,8 @@ import org.bukkit.util.Vector; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This service is responsible for handling holograms. @@ -322,3 +322,4 @@ public void setHologramLabel(@Nonnull Location loc, @Nullable String label) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/package-info.java new file mode 100644 index 0000000000..7d4bf00745 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/holograms/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains everything related to the + * {@link io.github.thebusybiscuit.slimefun5.core.services.holograms.HologramsService}. + */ +package io.github.thebusybiscuit.slimefun5.core.services.holograms; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Language.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/Language.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Language.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/Language.java index 0db0125e2e..86ec33d494 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/Language.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/Language.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import java.util.Arrays; import java.util.EnumMap; @@ -14,10 +14,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.services.LocalizationService; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This Class represents a {@link Language} that Slimefun can recognize and use. @@ -141,3 +141,4 @@ FileConfiguration[] getFiles() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguageFile.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguageFile.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguageFile.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguageFile.java index 67f90dfb60..f6c8de7892 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguageFile.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguageFile.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import javax.annotation.Nonnull; @@ -41,3 +41,4 @@ public String getFilePath(@Nonnull String languageId) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguagePreset.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguagePreset.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguagePreset.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguagePreset.java index 6b5e4bc09d..f0efcad4fc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/LanguagePreset.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/LanguagePreset.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -129,3 +129,4 @@ boolean isReadyForRelease() { return textDirection; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/SlimefunLocalization.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/SlimefunLocalization.java index a146a9f620..30aed3445f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/core/services/localization/SlimefunLocalization.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import java.util.Arrays; import java.util.Collection; @@ -20,17 +20,17 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.config.Config; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.api.SlimefunBranch; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.LocalizationService; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.BaseComponent; @@ -337,8 +337,8 @@ protected void loadEmbeddedLanguages() { meta.setLore(lore); } - meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); - meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ATTRIBUTES); + VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ENCHANTS); }); } @@ -442,3 +442,4 @@ public void sendMessages(CommandSender recipient, String key, UnaryOperator> sort(SlimefunProfiler profiler, Set 0) { // Check all supported versions of Minecraft @@ -1096,3 +1107,4 @@ public static boolean isNewlyInstalled() { return instance().threadService; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/SlimefunItems.java similarity index 99% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/SlimefunItems.java index 62bc4d59e9..1a4cba7897 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/SlimefunItems.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation; +package io.github.thebusybiscuit.slimefun5.implementation; import java.util.ArrayList; import java.util.HashMap; @@ -9,21 +9,21 @@ import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineTier; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.StormStaff; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ColoredFireworkStar; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineTier; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.StormStaff; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.LoreBuilder; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ColoredFireworkStar; /** * This class holds a static references to every {@link SlimefunItemStack} @@ -594,11 +594,11 @@ private SlimefunItems() {} static { ItemMeta meta = INDUSTRIAL_MINER.getItemMeta(); - meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); + VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ATTRIBUTES); INDUSTRIAL_MINER.setItemMeta(meta); ItemMeta meta2 = ADVANCED_INDUSTRIAL_MINER.getItemMeta(); - meta2.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); + VersionedItemFlag.addFlags(meta2, VersionedItemFlag.HIDE_ATTRIBUTES); ADVANCED_INDUSTRIAL_MINER.setItemMeta(meta2); } @@ -868,3 +868,4 @@ private SlimefunItems() {} INFUSED_ELYTRA.addUnsafeEnchantment(Enchantment.MENDING, 1); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/StartupWarnings.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/StartupWarnings.java index 77b3a7479a..8470699825 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/StartupWarnings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/StartupWarnings.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation; +package io.github.thebusybiscuit.slimefun5.implementation; import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; /** * This class stores some startup warnings we occasionally need to print. @@ -74,3 +74,4 @@ static void oldJavaVersion(Logger logger, int recommendedJavaVersion) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/CheatSheetSlimefunGuide.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/CheatSheetSlimefunGuide.java index 79ab38c662..40bf22b79d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/CheatSheetSlimefunGuide.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.guide; +package io.github.thebusybiscuit.slimefun5.implementation.guide; import java.util.LinkedList; import java.util.List; @@ -10,15 +10,15 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.SlimefunGuideItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.SlimefunGuideItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -82,3 +82,4 @@ public void createHeader(Player p, PlayerProfile profile, ChestMenu menu) { menu.addMenuClickHandler(1, ChestMenuUtils.getEmptyClickHandler()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/SurvivalSlimefunGuide.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/SurvivalSlimefunGuide.java index 617816af07..c3746c050f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/SurvivalSlimefunGuide.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.guide; +package io.github.thebusybiscuit.slimefun5.implementation.guide; import java.util.ArrayList; import java.util.Arrays; @@ -17,7 +17,6 @@ import org.bukkit.Tag; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.RecipeChoice; @@ -27,29 +26,29 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.recipes.MinecraftRecipe; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.guide.GuideHistory; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideImplementation; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.core.guide.options.SlimefunGuideSettings; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedItemFlag; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.SlimefunGuideItem; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.LockedItemGroup; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.guide.GuideHistory; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideImplementation; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.guide.options.SlimefunGuideSettings; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.SlimefunGuideItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler; @@ -361,7 +360,7 @@ public void openSearch(PlayerProfile profile, String input, boolean addToHistory ItemStack itemstack = CustomItemStack.create(slimefunItem.getItem(), meta -> { ItemGroup itemGroup = slimefunItem.getItemGroup(); meta.setLore(Arrays.asList("", ChatColor.DARK_GRAY + "\u21E8 " + ChatColor.WHITE + itemGroup.getDisplayName(p))); - meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS, VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); + VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ATTRIBUTES, VersionedItemFlag.HIDE_ENCHANTS, VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP); }); menu.addItem(index, itemstack); @@ -760,3 +759,4 @@ private void printErrorMessage(Player p, SlimefunItem item, Throwable x) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/package-info.java new file mode 100644 index 0000000000..34792f2257 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/guide/package-info.java @@ -0,0 +1,5 @@ +/** + * This package provides the different implementations of our + * {@link io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide} + */ +package io.github.thebusybiscuit.slimefun5.implementation.guide; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/SimpleBlockBreakHandler.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/SimpleBlockBreakHandler.java index 0122d13390..a2f3d877e7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/SimpleBlockBreakHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.handlers; +package io.github.thebusybiscuit.slimefun5.implementation.handlers; import java.util.List; @@ -9,9 +9,9 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidMineEvent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.MinerAndroid; +import io.github.thebusybiscuit.slimefun5.api.events.AndroidMineEvent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.MinerAndroid; /** * This simple implementation of {@link BlockBreakHandler} will execute the same code @@ -57,3 +57,4 @@ public void onExplode(Block b, List drops) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/VanillaInventoryDropHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/VanillaInventoryDropHandler.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/VanillaInventoryDropHandler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/VanillaInventoryDropHandler.java index 7ead892718..1c8d23fcda 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/VanillaInventoryDropHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/VanillaInventoryDropHandler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.handlers; +package io.github.thebusybiscuit.slimefun5.implementation.handlers; import java.util.List; @@ -14,8 +14,8 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; import io.papermc.lib.PaperLib; /** @@ -86,3 +86,4 @@ protected Inventory getInventory(@Nonnull T inventoryHolder) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/package-info.java similarity index 52% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/package-info.java index 2afaa20dce..c6dab3948d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/handlers/package-info.java @@ -1,5 +1,5 @@ /** - * This package holds simple implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemHandler}. + * This package holds simple implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.ItemHandler}. * These are just handlers that can be re-used frequently. */ -package io.github.thebusybiscuit.slimefun4.implementation.handlers; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.handlers; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/EnchantedItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/EnchantedItem.java similarity index 57% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/EnchantedItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/EnchantedItem.java index a7525c9971..430267d013 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/EnchantedItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/EnchantedItem.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * The {@link EnchantedItem} is an enchanted {@link SlimefunItem}. @@ -28,3 +28,4 @@ public EnchantedItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/HiddenItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/HiddenItem.java similarity index 60% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/HiddenItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/HiddenItem.java index dcfaa8a103..ccd3499481 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/HiddenItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/HiddenItem.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotConfigurable; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotConfigurable; /** * The {@link HiddenItem} is a {@link NotConfigurable} {@link SlimefunItem} @@ -25,3 +25,4 @@ public HiddenItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipe this.setHidden(true); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/LimitedUseItem.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/LimitedUseItem.java index c4377d4585..642d8d1e5e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/LimitedUseItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import java.util.Collections; import java.util.List; @@ -16,16 +16,16 @@ import org.bukkit.persistence.PersistentDataType; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.StormStaff; -import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.StormStaff; +import io.github.thebusybiscuit.slimefun5.utils.LoreBuilder; +import io.github.thebusybiscuit.slimefun5.utils.PatternUtils; /** * This class represents an item with a limited number of uses. @@ -150,3 +150,4 @@ private void updateItemLore(ItemStack item, ItemMeta meta, int usesLeft) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/RadioactiveItem.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/RadioactiveItem.java index 0a08ae0eff..6c75fc326d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/RadioactiveItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -6,15 +6,15 @@ import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; /** * A quick and easy implementation of {@link SlimefunItem} that also implements the @@ -91,3 +91,4 @@ public Radioactivity getRadioactivity() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/SimpleSlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/SimpleSlimefunItem.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/SimpleSlimefunItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/SimpleSlimefunItem.java index 839a3ce053..394e79a88c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/SimpleSlimefunItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/SimpleSlimefunItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -6,12 +6,12 @@ import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; /** * This is basically a quickstart class for your very first {@link SlimefunItem}. @@ -54,3 +54,4 @@ public void preRegister() { public abstract @Nonnull T getItemHandler(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/VanillaItem.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/VanillaItem.java index 7d6291b91a..6bdc18ace1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/VanillaItem.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * Represents a vanilla item that is overridden by Slimefun (like {@code ELYTRA}). @@ -47,3 +47,4 @@ public VanillaItem(ItemGroup itemGroup, ItemStack item, String id, RecipeType re useableInWorkbench = true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AltarRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AltarRecipe.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AltarRecipe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AltarRecipe.java index b42f909d3f..2ae6e063c0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AltarRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AltarRecipe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.altar; +package io.github.thebusybiscuit.slimefun5.implementation.items.altar; import java.util.ArrayList; import java.util.List; @@ -41,3 +41,4 @@ public List getInput() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientAltar.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientAltar.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientAltar.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientAltar.java index e7d153f33a..e0414b405f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientAltar.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientAltar.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.altar; +package io.github.thebusybiscuit.slimefun5.implementation.items.altar; import java.util.ArrayList; import java.util.List; @@ -8,15 +8,15 @@ import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.AncientAltarCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AncientAltarTask; +import io.github.thebusybiscuit.slimefun5.api.events.AncientAltarCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AncientAltarListener; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AncientAltarTask; /** * The {@link AncientAltar} is a multiblock structure. @@ -68,3 +68,4 @@ public List getRecipes() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientPedestal.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientPedestal.java index 5d2548e0b8..1a3531e55d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/AncientPedestal.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.altar; +package io.github.thebusybiscuit.slimefun5.implementation.items.altar; import java.util.Optional; @@ -20,21 +20,21 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AncientAltarTask; -import io.github.thebusybiscuit.slimefun4.utils.ArmorStandUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockDispenseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AncientAltarListener; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AncientAltarTask; +import io.github.thebusybiscuit.slimefun5.utils.ArmorStandUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * The {@link AncientPedestal} is a part of the {@link AncientAltar}. @@ -182,3 +182,4 @@ public void placeItem(@Nonnull Player p, @Nonnull Block b) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/package-info.java new file mode 100644 index 0000000000..3233da9d01 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/altar/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds the {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} implementations related to + * the {@link io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.altar; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidAction.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidAction.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidAction.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidAction.java index 296452b6b6..ba106478c2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidAction.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidAction.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -11,3 +11,4 @@ interface AndroidAction { void perform(ProgrammableAndroid android, Block b, BlockMenu inventory, BlockFace face); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidFuelSource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidFuelSource.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidFuelSource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidFuelSource.java index d2bdc34581..fece3703ec 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidFuelSource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidFuelSource.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import javax.annotation.Nonnull; import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; /** * This enum covers all different fuel sources a {@link ProgrammableAndroid} can have. @@ -47,3 +47,4 @@ public ItemStack getItem() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInstance.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInstance.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInstance.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInstance.java index ff68ea759a..ab17f8d63d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInstance.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInstance.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import org.bukkit.block.Block; @@ -21,3 +21,4 @@ public Block getBlock() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInterface.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInterface.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInterface.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInterface.java index ec21c6a83b..840002a6c4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInterface.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidInterface.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.block.Dispenser; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockDispenseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link AndroidInterface} are inventories used to interact with a {@link ProgrammableAndroid}. @@ -36,3 +36,4 @@ public BlockDispenseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidType.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidType.java index c4fa1a0308..f77e95cefa 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/AndroidType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import javax.annotation.Nonnull; @@ -62,3 +62,4 @@ boolean isType(@Nonnull AndroidType type) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ButcherAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ButcherAndroid.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ButcherAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ButcherAndroid.java index 76e43e65fa..663d54c21b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ButcherAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ButcherAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.function.Predicate; @@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; public class ButcherAndroid extends ProgrammableAndroid { @@ -61,3 +61,4 @@ protected void attack(Block b, BlockFace face, Predicate predicate } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FarmerAndroid.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FarmerAndroid.java index cd8b72c723..44e6727276 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FarmerAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @@ -13,10 +13,10 @@ import org.bukkit.block.data.BlockData; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidFarmEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.events.AndroidFarmEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -81,3 +81,4 @@ private ItemStack getDropFromCrop(Material crop) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FishermanAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FishermanAndroid.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FishermanAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FishermanAndroid.java index a6ce80e2fe..f670884df5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FishermanAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/FishermanAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.concurrent.ThreadLocalRandom; @@ -11,10 +11,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.collections.RandomizedSet; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -66,3 +66,4 @@ protected void fish(Block b, BlockMenu menu) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Instruction.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Instruction.java index 03fba08cff..b2719627ca 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Instruction.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Instruction.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.HashMap; import java.util.Map; @@ -18,8 +18,8 @@ import org.bukkit.entity.Monster; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -303,3 +303,4 @@ public static Instruction getInstruction(@Nonnull String value) { return nameLookup.get(value); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/MinerAndroid.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/MinerAndroid.java index 8d041bafb5..d61f153771 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/MinerAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.Collection; import java.util.UUID; @@ -15,16 +15,16 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidMineEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.InfiniteBlockGenerator; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.events.AndroidMineEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.InfiniteBlockGenerator; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -159,3 +159,4 @@ private void breakBlock(BlockMenu menu, Collection drops, Block block } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ProgrammableAndroid.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ProgrammableAndroid.java index 669327a9bf..7137711287 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/ProgrammableAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.ArrayList; import java.util.Arrays; @@ -34,22 +34,21 @@ import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.bakedlibs.dough.skins.PlayerHead; -import io.github.bakedlibs.dough.skins.PlayerSkin; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; @@ -880,11 +879,10 @@ protected void move(Block b, BlockFace face, Block block) { block.setBlockData(blockData); Slimefun.runSync(() -> { - PlayerSkin skin = PlayerSkin.fromBase64(texture); Material type = block.getType(); // Ensure that this Block is still a Player Head if (type == Material.PLAYER_HEAD || type == Material.PLAYER_WALL_HEAD) { - PlayerHead.setSkin(block, skin, true); + VersionedPlayerHead.setSkin(block, texture, true); } }); @@ -918,3 +916,4 @@ protected void farm(Block b, BlockMenu menu, Block block, boolean isAdvanced) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Script.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Script.java index bdb647b5cd..b4af186e65 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/Script.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.io.File; import java.util.ArrayList; @@ -21,9 +21,9 @@ import io.github.bakedlibs.dough.config.Config; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; /** * A {@link Script} represents runnable code for a {@link ProgrammableAndroid}. @@ -266,3 +266,4 @@ public static void upload(Player p, AndroidType androidType, int id, String name } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/WoodcutterAndroid.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/WoodcutterAndroid.java index 0133cb3b25..d8f37af9cd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/WoodcutterAndroid.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.androids; +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; import java.util.List; import java.util.UUID; @@ -18,12 +18,12 @@ import io.github.bakedlibs.dough.blocks.Vein; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -173,6 +173,19 @@ private void replant(@Nonnull Block block) { } } + if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_21_4)) { + switch (logType) { + case PALE_OAK_LOG, + PALE_OAK_WOOD, + STRIPPED_PALE_OAK_LOG, + STRIPPED_PALE_OAK_WOOD -> { + saplingType = Material.PALE_OAK_SAPLING; + soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; + } + default -> {} + } + } + if (saplingType != null && soilRequirement != null) { if (soilRequirement.test(block.getRelative(BlockFace.DOWN).getType())) { // Replant the block @@ -186,3 +199,4 @@ private void replant(@Nonnull Block block) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/package-info.java new file mode 100644 index 0000000000..d39e81d44d --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/androids/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are related to the {@link io.github.thebusybiscuit.slimefun5.implementation.items.androids.ProgrammableAndroid}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.androids; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/ElytraCap.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/ElytraCap.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/ElytraCap.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/ElytraCap.java index 59ae6670a5..155ca30fa6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/ElytraCap.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/ElytraCap.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -9,15 +9,15 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectiveArmor; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.ElytraImpactListener; -import io.github.thebusybiscuit.slimefun4.utils.UnbreakingAlgorithm; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectiveArmor; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.ElytraImpactListener; +import io.github.thebusybiscuit.slimefun5.utils.UnbreakingAlgorithm; /** * The {@link ElytraCap} negates damage taken when crashing into a wall using an elytra. @@ -71,3 +71,4 @@ public NamespacedKey getArmorSetId() { return key; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/EnderBoots.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/EnderBoots.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/EnderBoots.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/EnderBoots.java index 13bf9cf315..75e0ea25ca 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/EnderBoots.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/EnderBoots.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.EnderPearl; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * {@link EnderBoots} are a pair of boots which negate damage caused @@ -24,3 +24,4 @@ public EnderBoots(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipe super(itemGroup, item, recipeType, recipe); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/FarmerShoes.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/FarmerShoes.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/FarmerShoes.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/FarmerShoes.java index 86bf5bbc1a..45598f065f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/FarmerShoes.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/FarmerShoes.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,10 +6,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * The {@link FarmerShoes} are just a simple pair of boots which allows a {@link Player} to walk @@ -26,3 +26,4 @@ public FarmerShoes(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recip } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/HazmatArmorPiece.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/HazmatArmorPiece.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/HazmatArmorPiece.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/HazmatArmorPiece.java index d3ed9916da..a361a1f022 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/HazmatArmorPiece.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/HazmatArmorPiece.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,12 +6,12 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectiveArmor; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectiveArmor; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * Represents 1 {@link SlimefunArmorPiece} of the Hazmat armor set. @@ -51,3 +51,4 @@ public NamespacedKey getArmorSetId() { return namespacedKey; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/LongFallBoots.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/LongFallBoots.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/LongFallBoots.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/LongFallBoots.java index 7872d93bb7..9555a60f7e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/LongFallBoots.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/LongFallBoots.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,10 +6,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; /** * {@link LongFallBoots} are a pair of boots which negate fall damage. @@ -50,3 +50,4 @@ public SoundEffect getSoundEffect() { return soundEffect; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/Parachute.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/Parachute.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/Parachute.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/Parachute.java index 5efec631ce..1563cd564f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/Parachute.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/Parachute.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Jetpack; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.ParachuteTask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Jetpack; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.ParachuteTask; /** * The {@link Parachute} is a {@link SlimefunItem} that can be equipped as a chestplate. @@ -32,3 +32,4 @@ public Parachute(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeT } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/RainbowArmorPiece.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/RainbowArmorPiece.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/RainbowArmorPiece.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/RainbowArmorPiece.java index 10a5030b5d..54420a6933 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/RainbowArmorPiece.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/RainbowArmorPiece.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import java.util.Arrays; @@ -11,10 +11,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * Represents a {@link SlimefunArmorPiece} with rainbow properties (leather armor changing color). @@ -60,3 +60,4 @@ public RainbowArmorPiece(ItemGroup itemGroup, SlimefunItemStack item, RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/SlimefunArmorPiece.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/SlimefunArmorPiece.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/SlimefunArmorPiece.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/SlimefunArmorPiece.java index 8ed493f066..dd13fbb6d2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/SlimefunArmorPiece.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/SlimefunArmorPiece.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,10 +7,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; public class SlimefunArmorPiece extends SlimefunItem { @@ -33,3 +33,4 @@ public PotionEffect[] getPotionEffects() { return effects; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/StomperBoots.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/StomperBoots.java index 726b359181..04eea39c1e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/StomperBoots.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.armor; +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -18,12 +18,12 @@ import org.bukkit.util.Vector; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * The Boots of the Stomper are boots which damage nearby enemies whenever the {@link Player} @@ -111,3 +111,4 @@ protected boolean canPush(@Nonnull Player player, @Nonnull LivingEntity entity) return entity.isValid() && !entity.getUniqueId().equals(player.getUniqueId()) && entity.isCollidable() && entity.hasGravity(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/package-info.java new file mode 100644 index 0000000000..c4c8712329 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/armor/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that are + * related to armor, such as the expandable + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece} class for example. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.armor; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractAutoCrafter.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractAutoCrafter.java index 4186291716..f09ec1060f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractAutoCrafter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.ArrayList; import java.util.HashMap; @@ -26,22 +26,22 @@ import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AutoCrafterListener; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AutoCrafterListener; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import io.papermc.lib.PaperLib; import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult; @@ -566,3 +566,4 @@ public final EnergyNetComponentType getEnergyComponentType() { return EnergyNetComponentType.CONSUMER; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractRecipe.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractRecipe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractRecipe.java index 12cef3cf9a..b57b68b354 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/AbstractRecipe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.Collection; import java.util.function.Predicate; @@ -14,10 +14,10 @@ import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.EnhancedCraftingTable; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.EnhancedCraftingTable; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -167,3 +167,4 @@ public static AbstractRecipe of(@Nullable SlimefunItem item, @Nonnull RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/ArmorAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/ArmorAutoCrafter.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/ArmorAutoCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/ArmorAutoCrafter.java index 195e3fa682..bfbb975934 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/ArmorAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/ArmorAutoCrafter.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.ArmorForge; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.ArmorForge; /** * The {@link ArmorAutoCrafter} is an implementation of the {@link AbstractAutoCrafter}. @@ -29,3 +29,4 @@ public ArmorAutoCrafter(ItemGroup itemGroup, SlimefunItemStack item, RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/EnhancedAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/EnhancedAutoCrafter.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/EnhancedAutoCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/EnhancedAutoCrafter.java index a3bc793540..2f37a97e3a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/EnhancedAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/EnhancedAutoCrafter.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.EnhancedCraftingTable; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AutoCrafterListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.EnhancedCraftingTable; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AutoCrafterListener; /** * The {@link EnhancedAutoCrafter} is an implementation of the {@link AbstractAutoCrafter}. @@ -30,3 +30,4 @@ public EnhancedAutoCrafter(ItemGroup itemGroup, SlimefunItemStack item, RecipeTy } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunAutoCrafter.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunAutoCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunAutoCrafter.java index d6b730b981..62ef8c31b2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunAutoCrafter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -16,14 +16,14 @@ import org.bukkit.persistence.PersistentDataType; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import io.papermc.lib.PaperLib; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -122,3 +122,4 @@ protected void updateRecipe(@Nonnull Block b, @Nonnull Player p) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunItemRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunItemRecipe.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunItemRecipe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunItemRecipe.java index 32cede3e95..ce6d1c83fc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunItemRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/SlimefunItemRecipe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.ArrayList; import java.util.Collection; @@ -10,11 +10,11 @@ import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -69,3 +69,4 @@ public String toString() { return item.getId(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaAutoCrafter.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaAutoCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaAutoCrafter.java index 5885d99aec..da6cff8c1e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaAutoCrafter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.ArrayList; import java.util.List; @@ -26,15 +26,15 @@ import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.MinecraftRecipeService; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.MinecraftRecipeService; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import io.papermc.lib.PaperLib; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -186,3 +186,4 @@ private List getRecipesFor(@Nonnull ItemStack item) { return recipes; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaRecipe.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaRecipe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaRecipe.java index 0654c4e366..30b5290271 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/VanillaRecipe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.ArrayList; import java.util.Collection; @@ -16,9 +16,9 @@ import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AsyncRecipeChoiceTask; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -114,3 +114,4 @@ public String toString() { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/package-info.java similarity index 54% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/package-info.java index 18d6c0deab..8b9b703602 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/package-info.java @@ -1,4 +1,4 @@ /** * This package contains any electric machines related to automatic crafting tables. */ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/Cooler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/Cooler.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/Cooler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/Cooler.java index 94c94097b5..120555ecd9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/Cooler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/Cooler.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.CoolerListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.Juice; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.CoolerListener; /** * The {@link Cooler} is a special variant of the {@link SlimefunBackpack}. @@ -37,3 +37,4 @@ public boolean isItemAllowed(ItemStack item, SlimefunItem itemAsSlimefunItem) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/EnderBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/EnderBackpack.java similarity index 64% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/EnderBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/EnderBackpack.java index 649a63c7be..780e865476 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/EnderBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/EnderBackpack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,14 +7,14 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link EnderBackpack} is a pretty simple {@link SlimefunItem} which opens your @@ -40,3 +40,4 @@ public EnderBackpack(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/RestoredBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/RestoredBackpack.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/RestoredBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/RestoredBackpack.java index a1b62862bd..232ae35ed8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/RestoredBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/RestoredBackpack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,10 +6,10 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; /** * This class represents a {@link SlimefunBackpack} that has been restored via /sf backpack for retrieving items if the @@ -38,3 +38,4 @@ public RestoredBackpack(@Nonnull ItemGroup itemGroup) { this.hidden = true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SlimefunBackpack.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SlimefunBackpack.java index 4f2a0e3500..2670d0c801 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SlimefunBackpack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -8,18 +8,18 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DistinctiveItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BackpackListener; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DistinctiveItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BackpackListener; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * This class represents a {@link SlimefunItem} that is considered a Backpack. @@ -96,3 +96,4 @@ public boolean canStack(@Nonnull ItemMeta itemMetaOne, @Nonnull ItemMeta itemMet return !hasLoreItem && !hasLoreSfItem; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SoulboundBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SoulboundBackpack.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SoulboundBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SoulboundBackpack.java index b320f03b5f..a6a6d74b2c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SoulboundBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/SoulboundBackpack.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; /** * This implementation of {@link SlimefunBackpack} is also {@link Soulbound}. @@ -23,3 +23,4 @@ public SoulboundBackpack(int size, ItemGroup itemGroup, SlimefunItemStack item, } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/package-info.java new file mode 100644 index 0000000000..1a1038899c --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds classes related to + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/AbstractMonsterSpawner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/AbstractMonsterSpawner.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/AbstractMonsterSpawner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/AbstractMonsterSpawner.java index d0c24310f4..393369afee 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/AbstractMonsterSpawner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/AbstractMonsterSpawner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.List; import java.util.Locale; @@ -16,11 +16,11 @@ import org.bukkit.inventory.meta.BlockStateMeta; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; /** * This is a parent class for the {@link BrokenSpawner} and {@link RepairedSpawner} @@ -110,3 +110,4 @@ public ItemStack getItemForEntityType(@Nonnull EntityType type) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BlockPlacer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BlockPlacer.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BlockPlacer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BlockPlacer.java index 1e567f803f..27bce33eb9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BlockPlacer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BlockPlacer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.List; import java.util.UUID; @@ -22,19 +22,19 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.MaterialTagSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.MaterialTagSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockDispenseHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import io.papermc.lib.PaperLib; import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult; @@ -263,3 +263,4 @@ private void schedulePlacement(Block b, Inventory inv, ItemStack item, Runnable }, 2L); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BrokenSpawner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BrokenSpawner.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BrokenSpawner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BrokenSpawner.java index df6121194e..f5cc61258d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/BrokenSpawner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/BrokenSpawner.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; /** * This implementation of {@link SlimefunItem} represents a Broken Spawner. @@ -38,3 +38,4 @@ private ItemUseHandler onRightClick() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Composter.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Composter.java index ee0e546090..6586be3620 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Composter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.LinkedList; import java.util.List; @@ -19,15 +19,15 @@ import io.github.bakedlibs.dough.protection.Interaction; import io.github.bakedlibs.dough.scheduling.TaskQueue; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; public class Composter extends SimpleSlimefunItem implements RecipeDisplayItem { @@ -141,3 +141,4 @@ private ItemStack getOutput(Player p, ItemStack input) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Crucible.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Crucible.java index f11e7a35ad..e7a0998b74 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/Crucible.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.LinkedList; import java.util.List; @@ -18,19 +18,19 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -235,3 +235,4 @@ private void runPostTask(Block block, SoundEffect sound, int times) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/EnhancedFurnace.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/EnhancedFurnace.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/EnhancedFurnace.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/EnhancedFurnace.java index b41cd8904f..9d55fad018 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/EnhancedFurnace.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/EnhancedFurnace.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.concurrent.ThreadLocalRandom; @@ -10,12 +10,12 @@ import org.bukkit.block.Furnace; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; import io.papermc.lib.PaperLib; import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult; @@ -112,3 +112,4 @@ private void setProgress(@Nonnull Furnace furnace) { furnace.setCookTime((short) Math.min(cookTime, furnace.getCookTimeTotal() - 1)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HardenedGlass.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HardenedGlass.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HardenedGlass.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HardenedGlass.java index 3fa2150e67..13e5ec9688 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HardenedGlass.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HardenedGlass.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,10 +6,10 @@ import org.bukkit.entity.WitherSkull; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.WitherProof; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.WitherProof; /** * {@link HardenedGlass} is a special kind of block which cannot be destroyed by explosions. @@ -29,3 +29,4 @@ public HardenedGlass(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HologramProjector.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HologramProjector.java index 640d0d375a..10a457216d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/HologramProjector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -14,20 +14,20 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.utils.ArmorStandUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.holograms.HologramsService; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.utils.ArmorStandUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -164,3 +164,4 @@ private static void killArmorStand(@Nonnull Block b) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/IgnitionChamber.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/IgnitionChamber.java index 50c55891aa..91251c9d33 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/IgnitionChamber.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -17,14 +17,14 @@ import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -126,3 +126,4 @@ public static boolean useFlintAndSteel(Player p, Block smelteryBlock) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/OutputChest.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/OutputChest.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/OutputChest.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/OutputChest.java index 5e82014379..99a3b19f30 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/OutputChest.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/OutputChest.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.Optional; @@ -15,12 +15,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -100,3 +100,4 @@ public static Optional findOutputChestFor(@Nonnull Block b, @Nonnull } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RainbowBlock.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RainbowBlock.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RainbowBlock.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RainbowBlock.java index 20be3883a3..dd095f09e8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RainbowBlock.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RainbowBlock.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.RainbowTickHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.RainbowTickHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * A {@link RainbowBlock} cycles through different colored {@link Material Materials}. @@ -34,3 +34,4 @@ public RainbowTickHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RepairedSpawner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RepairedSpawner.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RepairedSpawner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RepairedSpawner.java index 8084e40e87..16f6cb4bfd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/RepairedSpawner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/RepairedSpawner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import java.util.ArrayList; import java.util.Collection; @@ -12,14 +12,14 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * A {@link RepairedSpawner} is the repaired variant of a {@link BrokenSpawner}. @@ -94,3 +94,4 @@ public Collection getDrops() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/UnplaceableBlock.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/UnplaceableBlock.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/UnplaceableBlock.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/UnplaceableBlock.java index 8002996589..d95878101d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/UnplaceableBlock.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/UnplaceableBlock.java @@ -1,18 +1,18 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This is a simple {@link SlimefunItem} implementation which implements the {@link NotPlaceable} @@ -42,3 +42,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/WitherProofBlock.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/WitherProofBlock.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/WitherProofBlock.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/WitherProofBlock.java index a4cd38a985..8e4bfcd915 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/WitherProofBlock.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/WitherProofBlock.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,11 +6,11 @@ import org.bukkit.entity.Wither; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.WitherProof; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.WitherProof; /** * A quick and easy implementation of {@link SlimefunItem} that also implements the @@ -40,3 +40,4 @@ public void onAttack(Block block, Wither wither) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/package-info.java new file mode 100644 index 0000000000..66d09ff4a3 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/blocks/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains a few miscellaneous implementations of + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} which are blocks. + * Such as the {@link io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer} for example. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.blocks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractCargoNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractCargoNode.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractCargoNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractCargoNode.java index c335e7fc25..de09fb05f9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractCargoNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractCargoNode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -13,17 +13,17 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.ColoredMaterial; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.ColoredMaterial; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -153,3 +153,4 @@ public int getSelectedChannel(@Nonnull Block b) { abstract void markDirty(@Nonnull Location loc); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractFilterNode.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractFilterNode.java index c28891e81a..1dfbb57be8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AbstractFilterNode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -11,13 +11,13 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -139,3 +139,4 @@ protected void markDirty(@Nonnull Location loc) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AdvancedCargoOutputNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AdvancedCargoOutputNode.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AdvancedCargoOutputNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AdvancedCargoOutputNode.java index 695acfa42f..61ae61759f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AdvancedCargoOutputNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/AdvancedCargoOutputNode.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * The {@link AdvancedCargoOutputNode} is the advanced version of the @@ -30,3 +30,4 @@ protected int[] getBorder() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoConnectorNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoConnectorNode.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoConnectorNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoConnectorNode.java index 45c795bb7c..1809600981 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoConnectorNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoConnectorNode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,13 +7,13 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link CargoConnectorNode} connects a {@link CargoNode} with a {@link CargoNet}. @@ -50,3 +50,4 @@ public CargoConnectorNode(ItemGroup itemGroup, SlimefunItemStack item, RecipeTyp }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoInputNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoInputNode.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoInputNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoInputNode.java index fe32c6fe7d..8643aee804 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoInputNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoInputNode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,10 +8,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -81,3 +81,4 @@ protected void updateBlockMenu(BlockMenu menu, Block b) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoManager.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoManager.java index 2c1c14e0fe..bfb71b6f22 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import java.util.Optional; @@ -10,16 +10,16 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -82,3 +82,4 @@ public void onRightClick(PlayerRightClickEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoNode.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoNode.java index d68e7355c1..6605117a5c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoNode.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.Nonnull; import org.bukkit.block.Block; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; /** * This interface marks a {@link SlimefunItem} as a {@link CargoNode}. @@ -34,3 +34,4 @@ public interface CargoNode { boolean hasItemFilter(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoOutputNode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoOutputNode.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoOutputNode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoOutputNode.java index d00de44ea7..501bb32738 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoOutputNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/CargoOutputNode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,10 +9,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -54,3 +54,4 @@ protected void markDirty(Location loc) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/ReactorAccessPort.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/ReactorAccessPort.java index 52b61e10d2..27d7a37b62 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/ReactorAccessPort.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -12,18 +12,18 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.CoolantCell; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.CoolantCell; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -177,3 +177,4 @@ private BlockMenu getReactor(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/TrashCan.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/TrashCan.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/TrashCan.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/TrashCan.java index a61f8deb54..b0eca5bc3c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/TrashCan.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/TrashCan.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.cargo; +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,11 +7,11 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -76,3 +76,4 @@ public boolean isSynchronized() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/package-info.java new file mode 100644 index 0000000000..bd2ef62fd9 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/cargo/package-info.java @@ -0,0 +1,7 @@ +/** + * This package provides the different implementations of + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are related to the {@link io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet}, most + * notably: Cargo Nodes. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.cargo; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/AbstractEnergyProvider.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/AbstractEnergyProvider.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/AbstractEnergyProvider.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/AbstractEnergyProvider.java index e84871e1ce..3e6ab66fc3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/AbstractEnergyProvider.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/AbstractEnergyProvider.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric; import java.util.ArrayList; import java.util.HashSet; @@ -14,15 +14,15 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetProvider; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -124,3 +124,4 @@ public List getDisplayRecipes() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/Capacitor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/Capacitor.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/Capacitor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/Capacitor.java index 21f39ceb73..afab894701 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/Capacitor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/Capacitor.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; /** * A {@link Capacitor} is an {@link EnergyNetComponent} that serves as the energy @@ -48,3 +48,4 @@ public int getCapacity() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyConnector.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyConnector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyConnector.java index 90b56d4a20..5a4b54e6ff 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyConnector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,14 +8,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This {@link EnergyNetComponent} is a connector for the {@link EnergyNet} networks. @@ -62,3 +62,4 @@ public int getCapacity() { return 0; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyRegulator.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyRegulator.java index 2377d02d09..0f37416ca2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/EnergyRegulator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,16 +7,16 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -87,3 +87,4 @@ private void tick(@Nonnull Block b) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/JetBoots.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/JetBoots.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/JetBoots.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/JetBoots.java index ebd08cc5de..c5b59c32da 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/JetBoots.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/JetBoots.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.JetBootsTask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.JetBootsTask; /** * {@link JetBoots} allow you to hover for a bit. @@ -44,3 +44,4 @@ public float getMaxItemCharge(ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Jetpack.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Jetpack.java index a5adefa937..efb4691d61 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Jetpack.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.JetpackTask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.JetpackTask; /** * {@link JetBoots} allow you to fly up into the air. @@ -43,3 +43,4 @@ public float getMaxItemCharge(ItemStack item) { return capacity; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiTool.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiTool.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiTool.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiTool.java index d608742da4..a9b6a68637 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiTool.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiTool.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import java.util.ArrayList; import java.util.List; @@ -16,16 +16,16 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEntityType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEntityType; /** * The {@link MultiTool} is an electric device which can mimic @@ -155,3 +155,4 @@ public void preRegister() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiToolMode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiToolMode.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiToolMode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiToolMode.java index d3963496d4..a403af3169 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiToolMode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/MultiToolMode.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; class MultiToolMode { @@ -47,4 +47,4 @@ String getItemId() { boolean isEnabled() { return enabled.getValue(); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Multimeter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Multimeter.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Multimeter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Multimeter.java index f194494345..bebffee905 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Multimeter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/Multimeter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import java.util.Optional; @@ -8,16 +8,16 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; /** * The {@link Multimeter} is used to measure charge and capacity of any {@link EnergyNetComponent}. @@ -59,3 +59,4 @@ public ItemUseHandler getItemHandler() { }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/SolarHelmet.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/SolarHelmet.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/SolarHelmet.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/SolarHelmet.java index d864a84c2a..ca57ca37b0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/SolarHelmet.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/SolarHelmet.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -8,14 +8,14 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.DoubleRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.armor.SolarHelmetTask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.DoubleRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.armor.SolarHelmetTask; /** * The {@link SolarHelmet} can be worn by {@link Player}. @@ -73,3 +73,4 @@ private void recharge(@Nullable ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/package-info.java new file mode 100644 index 0000000000..f3020f2fdb --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/gadgets/package-info.java @@ -0,0 +1,7 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are used in combination with electricity, like the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Multimeter} or the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.SolarHelmet} + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/BioGenerator.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/BioGenerator.java index c9cd289dec..badc8b37f8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/BioGenerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,12 +6,12 @@ import org.bukkit.Tag; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -105,3 +105,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CoalGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CoalGenerator.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CoalGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CoalGenerator.java index cb2a488441..b72a9b5ebd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CoalGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CoalGenerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,9 +7,9 @@ import org.bukkit.Tag; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -89,3 +89,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CombustionGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CombustionGenerator.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CombustionGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CombustionGenerator.java index eb69dc5718..abb57f5f7f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CombustionGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/CombustionGenerator.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -32,3 +32,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/LavaGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/LavaGenerator.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/LavaGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/LavaGenerator.java index 59100fbeb1..9306107c1d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/LavaGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/LavaGenerator.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -30,3 +30,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/MagnesiumGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/MagnesiumGenerator.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/MagnesiumGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/MagnesiumGenerator.java index 110b7fff05..c9c9e07a2a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/MagnesiumGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/MagnesiumGenerator.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -31,3 +31,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/SolarGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/SolarGenerator.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/SolarGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/SolarGenerator.java index a44f05d462..753592cbc5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/SolarGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/SolarGenerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,15 +7,15 @@ import org.bukkit.World.Environment; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNet; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetProvider; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNet; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; @@ -128,3 +128,4 @@ public void preRegister() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/package-info.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/package-info.java index 27d9fcfb58..20cc88b29c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/generators/package-info.java @@ -2,4 +2,4 @@ * This package contains the different implementations of * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator}. */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoAnvil.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoAnvil.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoAnvil.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoAnvil.java index 20b5a12d40..7b60ddb60c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoAnvil.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoAnvil.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -88,3 +88,4 @@ private ItemStack repair(ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoBrewer.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoBrewer.java index 6dcd35c335..10c2523547 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoBrewer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; @@ -15,11 +15,11 @@ import org.bukkit.potion.PotionType; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -149,7 +149,7 @@ public AutoBrewer(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipe } @ParametersAreNonnullByDefault - @SuppressWarnings("deprecration") + @SuppressWarnings("deprecation") private ItemStack brewPreBasePotionType(Material input, Material potionType, PotionMeta potion) { PotionData data = potion.getBasePotionData(); PotionType type = data.getType(); @@ -213,3 +213,4 @@ private boolean isPotion(@Nonnull Material mat) { return "AUTO_BREWER"; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoDrier.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoDrier.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoDrier.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoDrier.java index e7245f5992..81fe683927 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoDrier.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/AutoDrier.java @@ -1,22 +1,22 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.ArrayList; import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import org.bukkit.Material; import org.bukkit.Tag; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -118,3 +118,4 @@ public String getMachineIdentifier() { return "AUTO_DRIER"; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/CarbonPress.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/CarbonPress.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/CarbonPress.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/CarbonPress.java index 1ea7aa7769..2d0119a0b8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/CarbonPress.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/CarbonPress.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,11 +6,11 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -43,3 +43,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ChargingBench.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ChargingBench.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ChargingBench.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ChargingBench.java index b535e44b40..b8287f9ad0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ChargingBench.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ChargingBench.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -82,3 +82,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricDustWasher.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricDustWasher.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricDustWasher.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricDustWasher.java index d640571f2f..0a458b13e8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricDustWasher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricDustWasher.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,13 +6,13 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.OreWasher; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.OreWasher; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -92,3 +92,4 @@ private boolean hasFreeSlot(BlockMenu menu) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricFurnace.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricFurnace.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricFurnace.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricFurnace.java index c77e660dfb..b5889f50a5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricFurnace.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricFurnace.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,11 +9,11 @@ import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.RecipeChoice.MaterialChoice; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -57,3 +57,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricGoldPan.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricGoldPan.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricGoldPan.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricGoldPan.java index a454482f8e..2be5227ebb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricGoldPan.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricGoldPan.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.ArrayList; import java.util.List; @@ -9,14 +9,14 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.NetherGoldPan; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.NetherGoldPan; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -128,3 +128,4 @@ private boolean hasFreeSlot(@Nonnull BlockMenu menu) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotFactory.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotFactory.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotFactory.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotFactory.java index 287383f517..a6e6500b61 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotFactory.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotFactory.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -27,3 +27,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotPulverizer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotPulverizer.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotPulverizer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotPulverizer.java index 12a93cb07b..00da2a5b09 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricIngotPulverizer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricIngotPulverizer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,14 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -67,3 +67,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricOreGrinder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricOreGrinder.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricOreGrinder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricOreGrinder.java index 19a6425eea..226caee27f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricOreGrinder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricOreGrinder.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -31,3 +31,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricPress.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricPress.java index 93ad03ab5f..5acea8dd75 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricPress.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,13 +6,13 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -109,3 +109,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricSmeltery.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricSmeltery.java index 0f61a4e8c6..bee097ab30 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectricSmeltery.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.Collections; import java.util.Comparator; @@ -15,14 +15,14 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -148,3 +148,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectrifiedCrucible.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectrifiedCrucible.java index ff5a33474b..4dabfa66a3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/ElectrifiedCrucible.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.Tag; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -56,3 +56,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FluidPump.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FluidPump.java index 729fd2ff51..5b12c9c6ac 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FluidPump.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; @@ -17,18 +17,18 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.blocks.Vein; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -264,3 +264,4 @@ public boolean isSynchronized() { }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodComposter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodComposter.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodComposter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodComposter.java index 7a2efcb226..cb75c34f5d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodComposter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodComposter.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.OrganicFertilizer; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.OrganicFertilizer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -44,3 +44,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodFabricator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodFabricator.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodFabricator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodFabricator.java index b03e81cc3e..ed576ca333 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FoodFabricator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/FoodFabricator.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.OrganicFood; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.OrganicFood; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -43,3 +43,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Freezer.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Freezer.java index 2da6de3dd8..54723696cf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Freezer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -77,3 +77,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/HeatedPressureChamber.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/HeatedPressureChamber.java index b1aacbc8f7..14092b4499 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/HeatedPressureChamber.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import java.util.ArrayList; import java.util.Collections; @@ -14,12 +14,12 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -106,3 +106,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Refinery.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Refinery.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Refinery.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Refinery.java index 98cc035072..7f8d8d65ef 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Refinery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/Refinery.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -33,3 +33,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java index 8997df479e..18cad8c16e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,15 +8,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -93,3 +93,4 @@ public boolean isSynchronized() { protected abstract void tick(Block b); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java index 3bb587f914..033960ead0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/AnimalGrowthAccelerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators; import org.bukkit.block.Block; import org.bukkit.entity.Ageable; @@ -6,13 +6,13 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -66,3 +66,4 @@ private boolean isReadyToGrow(Entity n) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java index b5d032f459..4bf48a2c68 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/CropGrowthAccelerator.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators; import org.bukkit.block.Block; import org.bukkit.block.data.Ageable; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -75,3 +75,4 @@ private boolean grow(Block machine, BlockMenu inv, Block crop) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java index 51d50cde95..6a06f1b608 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/TreeGrowthAccelerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,15 +10,15 @@ import org.bukkit.block.data.type.Sapling; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -124,3 +124,4 @@ protected boolean isFertilizer(@Nullable ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/package-info.java similarity index 62% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/package-info.java index 96accec694..3496a71ae2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/accelerators/package-info.java @@ -2,4 +2,4 @@ * This package contains any electric machines related to growth accelerations. * These growth accelerators speed up the growth of animals or plants. */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java index 9f4e03f481..f2a35705df 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting; import java.util.Collections; import java.util.List; @@ -13,12 +13,12 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -98,3 +98,4 @@ protected boolean isEnchantmentAmountAllowed(int numberOfEnchants) { return numberOfEnchants <= maxEnchants.getValue(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoDisenchanter.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoDisenchanter.java index 61f38c5b75..7aa6d77b0a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoDisenchanter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting; import java.util.HashMap; import java.util.Map; @@ -16,12 +16,12 @@ import org.bukkit.inventory.meta.Repairable; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.events.AutoDisenchantEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.AutoDisenchantEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -168,3 +168,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoEnchanter.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoEnchanter.java index db11586454..387fa385c3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/AutoEnchanter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting; import java.util.HashMap; import java.util.Map; @@ -13,13 +13,13 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.events.AsyncAutoEnchanterProcessEvent; -import io.github.thebusybiscuit.slimefun4.api.events.AutoEnchantEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.events.AsyncAutoEnchanterProcessEvent; +import io.github.thebusybiscuit.slimefun5.api.events.AutoEnchantEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -170,3 +170,4 @@ public String getMachineIdentifier() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/BookBinder.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/BookBinder.java index 4ac521faa2..793de35bfb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/BookBinder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/BookBinder.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting; import java.util.HashMap; import java.util.Map; @@ -13,11 +13,11 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -190,4 +190,4 @@ private int combineEnchantmentLevels(int maxLevel, int lvl1, int lvl2) { } } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/package-info.java new file mode 100644 index 0000000000..7814919d6c --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/enchanting/package-info.java @@ -0,0 +1,7 @@ +/** + * This package contains any electric machines related to enchanting. + * Prominent examples are the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoEnchanter} and + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoDisenchanter} + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AbstractEntityAssembler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AbstractEntityAssembler.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AbstractEntityAssembler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AbstractEntityAssembler.java index 4c6be5dc3f..eeda06f86a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AbstractEntityAssembler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AbstractEntityAssembler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import java.util.List; @@ -18,20 +18,20 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -302,3 +302,4 @@ public EnergyNetComponentType getEnergyComponentType() { public abstract T spawnEntity(Location l); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AnimalProduce.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AnimalProduce.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AnimalProduce.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AnimalProduce.java index ed4e2c381f..bf97874592 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AnimalProduce.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AnimalProduce.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import java.util.function.Predicate; @@ -37,3 +37,4 @@ public boolean test(@Nonnull LivingEntity entity) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AutoBreeder.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AutoBreeder.java index 072b69f968..d015bc30ad 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/AutoBreeder.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -12,17 +12,17 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -136,3 +136,4 @@ private boolean canBreed(@Nonnull Entity n) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ExpCollector.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ExpCollector.java index bff5364220..bba97c3e72 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ExpCollector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import java.util.Iterator; @@ -14,17 +14,17 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.KnowledgeFlask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.KnowledgeFlask; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -202,3 +202,4 @@ public ExpCollector setCapacity(int energyCapacity) { return this; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/IronGolemAssembler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/IronGolemAssembler.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/IronGolemAssembler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/IronGolemAssembler.java index 727dc342d1..d1e8ede2b9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/IronGolemAssembler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/IronGolemAssembler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,11 +9,11 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -76,3 +76,4 @@ public IronGolem spawnEntity(Location l) { return l.getWorld().spawn(l, IronGolem.class); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ProduceCollector.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ProduceCollector.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ProduceCollector.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ProduceCollector.java index e1d5e1f4e3..4c04b5b78d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ProduceCollector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/ProduceCollector.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import java.util.ArrayList; import java.util.HashSet; @@ -23,16 +23,16 @@ import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; @@ -176,3 +176,4 @@ private boolean isValidAnimal(Entity n, Predicate predicate) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/WitherAssembler.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/WitherAssembler.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/WitherAssembler.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/WitherAssembler.java index 9ebb73f8b2..66d7e4f03c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/WitherAssembler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/WitherAssembler.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,10 +8,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -74,3 +74,4 @@ public Wither spawnEntity(Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/package-info.java similarity index 54% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/package-info.java index d7723caf74..b04655b410 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/entities/package-info.java @@ -1,6 +1,6 @@ /** * This package contains any electric machines related to {@link org.bukkit.entity.Entity} interactions, most notably * the - * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.AbstractEntityAssembler}. + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.AbstractEntityAssembler}. */ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/package-info.java new file mode 100644 index 0000000000..7e4d4828a8 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/machines/package-info.java @@ -0,0 +1,8 @@ +/** + * This package contains the different implementations of + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that are also an + * {@link io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent} with the type {@code CONSUMER}. + * + * Machines do not generate power, they consume it. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/package-info.java new file mode 100644 index 0000000000..2b7e04bc1c --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains the different implementations of + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that also implement the interface + * {@link io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent} + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.electric; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NetherStarReactor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NetherStarReactor.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NetherStarReactor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NetherStarReactor.java index 56ece1a036..893b6fa368 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NetherStarReactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NetherStarReactor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,11 +11,11 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -67,3 +67,4 @@ public ItemStack getProgressBar() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NuclearReactor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NuclearReactor.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NuclearReactor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NuclearReactor.java index 7e30bf7e93..8b017e1356 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NuclearReactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/NuclearReactor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,11 +6,11 @@ import org.bukkit.Location; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -60,3 +60,4 @@ public void extraTick(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/Reactor.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/Reactor.java index aeb3477799..99d2a4a8dd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/Reactor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors; import java.util.HashMap; import java.util.HashSet; @@ -21,23 +21,23 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.ReactorExplodeEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineProcessHolder; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.ReactorAccessPort; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.AbstractEnergyProvider; -import io.github.thebusybiscuit.slimefun4.implementation.operations.FuelOperation; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.events.ReactorExplodeEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineProcessHolder; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineProcessor; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.ReactorAccessPort; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.AbstractEnergyProvider; +import io.github.thebusybiscuit.slimefun5.implementation.operations.FuelOperation; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator; @@ -488,3 +488,4 @@ protected BlockMenu getAccessPort(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/ReactorMode.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/ReactorMode.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/ReactorMode.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/ReactorMode.java index 82fd1c354e..2dba17230e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/ReactorMode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/ReactorMode.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors; +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors; import java.util.Locale; @@ -32,3 +32,4 @@ public String toString() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/package-info.java new file mode 100644 index 0000000000..6f2c575468 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/electric/reactors/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains the different implementations of + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorFloor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorFloor.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorFloor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorFloor.java index be9245e51a..b0f5444433 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorFloor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorFloor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.elevator; +package io.github.thebusybiscuit.slimefun5.implementation.items.elevator; import javax.annotation.Nonnull; @@ -88,4 +88,4 @@ public int getNumber() { return number; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorPlate.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorPlate.java index 44fde1a2b8..cb686936fd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/ElevatorPlate.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.elevator; +package io.github.thebusybiscuit.slimefun5.implementation.items.elevator; import java.util.HashSet; import java.util.LinkedList; @@ -20,15 +20,15 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import io.papermc.lib.PaperLib; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -227,3 +227,4 @@ public void openEditor(Player p, Block b) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/package-info.java new file mode 100644 index 0000000000..282e23b04a --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/elevator/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds the {@link io.github.thebusybiscuit.slimefun5.implementation.items.elevator.ElevatorPlate} and any + * related classes to making the elevator work. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.elevator; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/BirthdayCake.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/BirthdayCake.java similarity index 60% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/BirthdayCake.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/BirthdayCake.java index 9544132ad0..3e34dfb0aa 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/BirthdayCake.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/BirthdayCake.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; /** * The {@link BirthdayCake} is a seasonal item which only appears in october. @@ -25,3 +25,4 @@ public BirthdayCake(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/DietCookie.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/DietCookie.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/DietCookie.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/DietCookie.java index 08bf524e5d..a6e820aaea 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/DietCookie.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/DietCookie.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link DietCookie} gives you a {@link PotionEffect} of Type {@code PotionEffectType.LEVITATION} @@ -46,3 +46,4 @@ public DietCookie(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipe }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/FortuneCookie.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/FortuneCookie.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/FortuneCookie.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/FortuneCookie.java index c39ec147d7..dfb8b2742f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/FortuneCookie.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/FortuneCookie.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -9,14 +9,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.core.services.LocalizationService; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link FortuneCookie} is a rather simple {@link SlimefunItem}, it's a cookie which @@ -44,3 +44,4 @@ public ItemConsumptionHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/HeavyCream.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/HeavyCream.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/HeavyCream.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/HeavyCream.java index e5ac3be9aa..088bd50200 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/HeavyCream.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/HeavyCream.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import java.util.Optional; @@ -8,12 +8,12 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This {@link SlimefunItem} can be obtained by crafting, it's @@ -41,4 +41,4 @@ public ItemUseHandler getItemHandler() { }; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/Juice.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/Juice.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/Juice.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/Juice.java index f8b61543e1..eded41132e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/Juice.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/Juice.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import java.util.ArrayList; import java.util.List; @@ -14,15 +14,15 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.CoolerListener; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.CoolerListener; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This class represents a {@link SlimefunItem} that can be stored inside @@ -100,3 +100,4 @@ private void removeGlassBottle(Player p, ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MagicSugar.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MagicSugar.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MagicSugar.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MagicSugar.java index ae5c85e63e..0b636cd815 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MagicSugar.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MagicSugar.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,12 +11,12 @@ import org.bukkit.potion.PotionEffectType; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * {@link MagicSugar} is one of the oldest items in Slimefun, it is a special @@ -56,3 +56,4 @@ public MagicSugar(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipe } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MeatJerky.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MeatJerky.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MeatJerky.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MeatJerky.java index e4e6459e44..2bd911613a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MeatJerky.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MeatJerky.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * {@link MeatJerky} is just a piece of meat that gives some extra saturation. @@ -38,3 +38,4 @@ public ItemConsumptionHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MonsterJerky.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MonsterJerky.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MonsterJerky.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MonsterJerky.java index bdd55c2df4..0502649606 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/MonsterJerky.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/MonsterJerky.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,12 +6,12 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * {@link MonsterJerky} is basically just Rotten Flesh but without the Hunger Effect. @@ -40,3 +40,4 @@ public ItemConsumptionHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/package-info.java new file mode 100644 index 0000000000..fb63ffb074 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are related to food. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.food; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOMiner.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOMiner.java index f7975920ae..75161c3e57 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOMiner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.geo; +package io.github.thebusybiscuit.slimefun5.implementation.items.geo; import java.util.LinkedList; import java.util.List; @@ -15,25 +15,25 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineProcessHolder; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.operations.GEOMiningOperation; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.HologramOwner; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineProcessHolder; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineProcessor; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.SimpleBlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.operations.GEOMiningOperation; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; @@ -336,3 +336,4 @@ private void start(@Nonnull Block b, @Nonnull BlockMenu inv) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOScanner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOScanner.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOScanner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOScanner.java index 735e407964..8c1b0dbf9c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOScanner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/GEOScanner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.geo; +package io.github.thebusybiscuit.slimefun5.implementation.items.geo; import java.util.Optional; @@ -10,12 +10,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; public class GEOScanner extends SimpleSlimefunItem { @@ -48,3 +48,4 @@ private boolean hasAccess(Player p, Location l) { return p.hasPermission("slimefun.gps.bypass") || (Slimefun.getProtectionManager().hasPermission(p, l, Interaction.INTERACT_BLOCK)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/OilPump.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/OilPump.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/OilPump.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/OilPump.java index 412a65ad7b..3892538ea0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/OilPump.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/OilPump.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.geo; +package io.github.thebusybiscuit.slimefun5.implementation.items.geo; import java.util.Arrays; import java.util.List; @@ -13,14 +13,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -119,3 +119,4 @@ protected MachineRecipe findNextRecipe(BlockMenu inv) { return null; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/PortableGEOScanner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/PortableGEOScanner.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/PortableGEOScanner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/PortableGEOScanner.java index 88350314ca..6af8505aaf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/PortableGEOScanner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/PortableGEOScanner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.geo; +package io.github.thebusybiscuit.slimefun5.implementation.items.geo; import java.util.Optional; @@ -7,12 +7,12 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; public class PortableGEOScanner extends SimpleSlimefunItem { @@ -32,3 +32,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/package-info.java new file mode 100644 index 0000000000..0786f7c360 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/geo/package-info.java @@ -0,0 +1,8 @@ +/** + * This package holds implementations of any {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that + * deals with the {@link io.github.thebusybiscuit.slimefun5.api.geo.GEOResource} API. + * The most prominent example of this being the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOScanner} and the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.geo; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSControlPanel.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSControlPanel.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSControlPanel.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSControlPanel.java index 2857da1b0d..51d794cb13 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSControlPanel.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSControlPanel.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.gps; +package io.github.thebusybiscuit.slimefun5.implementation.items.gps; import java.util.Optional; @@ -10,12 +10,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; public class GPSControlPanel extends SimpleSlimefunItem { @@ -47,3 +47,4 @@ private boolean hasAccess(Player p, Location l) { return p.hasPermission("slimefun.gps.bypass") || (Slimefun.getProtectionManager().hasPermission(p, l, Interaction.INTERACT_BLOCK)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSMarkerTool.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSMarkerTool.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSMarkerTool.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSMarkerTool.java index 65c430237a..43b75a465b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSMarkerTool.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSMarkerTool.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.gps; +package io.github.thebusybiscuit.slimefun5.implementation.items.gps; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,14 +6,14 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link GPSMarkerTool} allows you to create a {@link Waypoint} at your current @@ -43,3 +43,4 @@ public ItemUseHandler getItemHandler() { }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSTransmitter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSTransmitter.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSTransmitter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSTransmitter.java index db34d6cbdd..a7e377b769 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/GPSTransmitter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/GPSTransmitter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.gps; +package io.github.thebusybiscuit.slimefun5.implementation.items.gps; import java.util.List; import java.util.UUID; @@ -12,16 +12,16 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -102,3 +102,4 @@ public EnergyNetComponentType getEnergyComponentType() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/package-info.java new file mode 100644 index 0000000000..8b491ad982 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/gps/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are related to the {@link io.github.thebusybiscuit.slimefun5.api.gps.GPSNetwork}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.gps; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/BeeWings.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/BeeWings.java similarity index 59% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/BeeWings.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/BeeWings.java index a632c9facf..27b1fe9955 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/BeeWings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/BeeWings.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BeeWingsListener; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.BeeWingsTask; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BeeWingsListener; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.BeeWingsTask; /** * The {@link BeeWings} are a special form of the elytra which gives you a slow falling effect @@ -30,3 +30,4 @@ public BeeWings(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeTy } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfernalBonemeal.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfernalBonemeal.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfernalBonemeal.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfernalBonemeal.java index a49e08e922..f1d5ae8968 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfernalBonemeal.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfernalBonemeal.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import java.util.Optional; @@ -13,11 +13,11 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link InfernalBonemeal} is a special type of bone meal which will work on @@ -60,3 +60,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedHopper.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedHopper.java index ba780ba2e7..97112cc97b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedHopper.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -12,16 +12,16 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.DoubleRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.DoubleRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.handlers.VanillaInventoryDropHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -114,3 +114,4 @@ private boolean isValidItem(@Nonnull Location l, @Nonnull Entity entity) { return false; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedMagnet.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedMagnet.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedMagnet.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedMagnet.java index 9cd3017583..e5a7c40ad4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedMagnet.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/InfusedMagnet.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,13 +6,13 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.DoubleRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.UnplaceableBlock; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.DoubleRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.UnplaceableBlock; /** * The {@link InfusedMagnet} is a {@link SlimefunItem} that allows a {@link Player} to @@ -43,3 +43,4 @@ public double getRadius() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeFlask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeFlask.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeFlask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeFlask.java index 6efdebe787..c41f79a08b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeFlask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeFlask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,14 +7,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link KnowledgeFlask} is a magical {@link SlimefunItem} which allows you to store @@ -53,3 +53,4 @@ public KnowledgeFlask(ItemGroup itemGroup, SlimefunItemStack item, RecipeType re } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeTome.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeTome.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeTome.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeTome.java index d22a41ef04..21670f41b8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/KnowledgeTome.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/KnowledgeTome.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import java.util.List; import java.util.UUID; @@ -15,15 +15,15 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link KnowledgeTome} allows you to copy every unlocked {@link Research} @@ -77,3 +77,4 @@ public KnowledgeTome(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicEyeOfEnder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicEyeOfEnder.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicEyeOfEnder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicEyeOfEnder.java index 9475a0cc01..4c129e8c1a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicEyeOfEnder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicEyeOfEnder.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,14 +8,14 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * The {@link MagicEyeOfEnder} allows you to launch an {@link EnderPearl} @@ -54,3 +54,4 @@ private boolean hasArmor(@Nonnull PlayerInventory inv) { // @formatter:on } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicalZombiePills.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicalZombiePills.java index d08f61d5d2..1f29d194cd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/MagicalZombiePills.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -16,16 +16,16 @@ import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This {@link SlimefunItem} allows you to convert any {@link ZombieVillager} to @@ -97,3 +97,4 @@ private void healZombifiedPiglin(@Nonnull PigZombie zombiePiglin) { loc.getWorld().spawnEntity(loc, EntityType.PIGLIN); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/SoulboundItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/SoulboundItem.java similarity index 52% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/SoulboundItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/SoulboundItem.java index 5eba932e4c..27325a4459 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/SoulboundItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/SoulboundItem.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.SoulboundRune; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.SoulboundListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.SoulboundRune; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.SoulboundListener; /** * Represents an Item that will not drop upon death. @@ -31,3 +31,4 @@ public SoulboundItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType typ } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/TelepositionScroll.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/TelepositionScroll.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/TelepositionScroll.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/TelepositionScroll.java index f71aaf0d53..b733d2e922 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/TelepositionScroll.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/TelepositionScroll.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,14 +8,14 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link TelepositionScroll} is a magical {@link SlimefunItem} that makes nearby any {@link LivingEntity} @@ -56,3 +56,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/package-info.java new file mode 100644 index 0000000000..3089c44f2c --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are considered magical items. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.magical; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/ElementalRune.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/ElementalRune.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/ElementalRune.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/ElementalRune.java index 91bd28fdde..779de69146 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/ElementalRune.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/ElementalRune.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar; /** * An {@link ElementalRune} is a very simple and basic crafting component @@ -33,3 +33,5 @@ public ElementalRune(ItemGroup itemGroup, SlimefunItemStack item, ItemStack[] re } } + + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/EnchantmentRune.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/EnchantmentRune.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/EnchantmentRune.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/EnchantmentRune.java index 40b1a9e24e..163233fa30 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/EnchantmentRune.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/EnchantmentRune.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes; import java.util.ArrayList; import java.util.Collection; @@ -21,15 +21,15 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemDropHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemDropHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; /** * This {@link SlimefunItem} allows you to enchant any enchantable {@link ItemStack} with a random @@ -194,3 +194,5 @@ private boolean findCompatibleItem(@Nonnull Entity n) { } } + + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/SoulboundRune.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/SoulboundRune.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/SoulboundRune.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/SoulboundRune.java index c015bce75a..8bb903f8ba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/SoulboundRune.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/SoulboundRune.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes; import java.util.Collection; import java.util.Optional; @@ -13,17 +13,17 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemDropHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.SoulboundItem; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemDropHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.SoulboundItem; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link SlimefunItem} allows you to convert any {@link ItemStack} into a @@ -123,3 +123,5 @@ private boolean findCompatibleItem(@Nonnull Entity entity) { return false; } } + + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/VillagerRune.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/VillagerRune.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/VillagerRune.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/VillagerRune.java index fe5195e22c..46c6a85452 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/VillagerRune.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/VillagerRune.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes; import java.util.concurrent.ThreadLocalRandom; @@ -14,15 +14,15 @@ import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; /** * This {@link SlimefunItem} allows you to reset a {@link Villager} profession. @@ -70,3 +70,5 @@ public VillagerRune(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci }; } } + + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/package-info.java new file mode 100644 index 0000000000..d2fe02d991 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/runes/package-info.java @@ -0,0 +1,6 @@ +/** + * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that is an ancient rune with functionality. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes; + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/StormStaff.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/StormStaff.java index f0fcab3310..f14a4f2f7b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/StormStaff.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -15,13 +15,13 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.LimitedUseItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.LimitedUseItem; /** * This {@link SlimefunItem} casts a {@link LightningStrike} where you are pointing. @@ -97,3 +97,4 @@ private void useItem(Player p, ItemStack item, Location loc) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WaterStaff.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WaterStaff.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WaterStaff.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WaterStaff.java index 9bb07f603b..2c24f40f51 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WaterStaff.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WaterStaff.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link WaterStaff} is a magical {@link SlimefunItem}. @@ -38,3 +38,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WindStaff.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WindStaff.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WindStaff.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WindStaff.java index 4e253149e7..3180c01080 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/WindStaff.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/WindStaff.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,15 +10,15 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link WindStaff} is a powerful staff which launches the {@link Player} forward when right clicked. @@ -63,3 +63,4 @@ public WindStaff(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeT }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/package-info.java new file mode 100644 index 0000000000..6e12ff7b86 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/staves/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that is + * considered a "Magical Staff". + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/EnderTalisman.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/EnderTalisman.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/EnderTalisman.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/EnderTalisman.java index 96db7a6b53..70084992e4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/EnderTalisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/EnderTalisman.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,10 +7,10 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.groups.LockedItemGroup; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; /** * An {@link EnderTalisman} is a special version of {@link Talisman} @@ -44,3 +44,4 @@ public void postRegister() { */ } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/MagicianTalisman.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/MagicianTalisman.java index 6c5ad0ffb7..4fdd6cfac5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/MagicianTalisman.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans; import java.util.HashSet; import java.util.List; @@ -17,10 +17,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.settings.TalismanEnchantment; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.settings.TalismanEnchantment; /** * The {@link MagicianTalisman} is a special kind of {@link Talisman} which awards a {@link Player} @@ -109,3 +109,4 @@ public boolean isEnchantmentBookAllowed() { return allowEnchantmentBooks.getValue(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/Talisman.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/Talisman.java index fe06a0aafe..c9b2500cdd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/Talisman.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans; +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans; import java.util.ArrayList; import java.util.List; @@ -28,15 +28,15 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.events.TalismanActivateEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.TalismanActivateEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; public class Talisman extends SlimefunItem { @@ -329,3 +329,4 @@ private static Player getPlayerByEventType(@Nonnull Event e) { return null; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/package-info.java new file mode 100644 index 0000000000..e2ca8c5dad --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/magical/talismans/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds any {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} related to the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Bandage.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Bandage.java index b87882cf6d..241134b744 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Bandage.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Bandage.java @@ -1,22 +1,22 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Effect; import org.bukkit.GameMode; import org.bukkit.Material; -import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedAttribute; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; /** * A {@link Bandage} or Rag is a medical supply which heals the {@link Player} and extinguishes @@ -42,7 +42,7 @@ public ItemUseHandler getItemHandler() { Player p = e.getPlayer(); // Player is neither burning nor injured - if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(VersionedAttribute.MAX_HEALTH).getValue()) { return; } @@ -59,3 +59,4 @@ public ItemUseHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/MedicalSupply.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/MedicalSupply.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/MedicalSupply.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/MedicalSupply.java index 350376eab8..ff16c80817 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/MedicalSupply.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/MedicalSupply.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; import java.util.Collections; import java.util.HashSet; @@ -7,18 +7,18 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedAttribute; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; public abstract class MedicalSupply extends SimpleSlimefunItem { @@ -73,8 +73,9 @@ public void clearNegativeEffects(@Nonnull LivingEntity n) { */ public void heal(@Nonnull LivingEntity n) { double health = n.getHealth() + healAmount; - double maxHealth = n.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); + double maxHealth = n.getAttribute(VersionedAttribute.MAX_HEALTH).getValue(); n.setHealth(Math.min(health, maxHealth)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Medicine.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Medicine.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Medicine.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Medicine.java index 01d06a79fa..3e0393698b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Medicine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Medicine.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.utils.RadiationUtils; public class Medicine extends MedicalSupply { @@ -28,3 +28,4 @@ public ItemConsumptionHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Splint.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Splint.java index 0a510ff28a..fccad50a1f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Splint.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Splint.java @@ -1,22 +1,22 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.GameMode; -import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedAttribute; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; public class Splint extends SimpleSlimefunItem { @@ -31,7 +31,7 @@ public Splint(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType Player p = e.getPlayer(); // Player is neither burning nor injured - if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + if (p.getFireTicks() <= 0 && p.getHealth() >= p.getAttribute(VersionedAttribute.MAX_HEALTH).getValue()) { return; } @@ -46,3 +46,4 @@ public Splint(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Vitamins.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Vitamins.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Vitamins.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Vitamins.java index bbd822bda3..a06311fc70 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/Vitamins.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/Vitamins.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.medical; +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,12 +8,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.utils.RadiationUtils; public class Vitamins extends MedicalSupply { @@ -40,3 +40,4 @@ public Vitamins(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeTy }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/package-info.java new file mode 100644 index 0000000000..21faf828f1 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/medical/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} that are + * related to healing yourself. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.medical; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/AlloyIngot.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/AlloyIngot.java similarity index 59% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/AlloyIngot.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/AlloyIngot.java index b13e811b6a..c77dc4301c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/AlloyIngot.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/AlloyIngot.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; /** * An {@link AlloyIngot} is a blend of different metals and resources. @@ -27,3 +27,4 @@ public AlloyIngot(ItemGroup itemGroup, SlimefunItemStack item, ItemStack[] recip } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/BasicCircuitBoard.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/BasicCircuitBoard.java similarity index 64% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/BasicCircuitBoard.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/BasicCircuitBoard.java index 3f8d123ea7..7ba133b2d3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/BasicCircuitBoard.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/BasicCircuitBoard.java @@ -1,20 +1,20 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.IronGolem; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.attributes.RandomMobDrop; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.attributes.RandomMobDrop; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link BasicCircuitBoard} is a basic crafting component which can be @@ -51,4 +51,4 @@ public ItemUseHandler getItemHandler() { return PlayerRightClickEvent::cancel; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/CoolantCell.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/CoolantCell.java similarity index 64% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/CoolantCell.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/CoolantCell.java index de7a24a652..bda5b46f13 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/CoolantCell.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/CoolantCell.java @@ -1,18 +1,18 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.UnplaceableBlock; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.ReactorAccessPort; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NetherStarReactor; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NuclearReactor; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.Reactor; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.UnplaceableBlock; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.ReactorAccessPort; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.NetherStarReactor; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.NuclearReactor; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.Reactor; /** * A {@link CoolantCell} is an {@link ItemStack} that is used to cool a {@link Reactor}. @@ -38,3 +38,4 @@ public CoolantCell(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recip } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/GoldIngot.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/GoldIngot.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/GoldIngot.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/GoldIngot.java index 689df4264d..9c630d9231 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/GoldIngot.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/GoldIngot.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; /** * The {@link GoldIngot} from Slimefun is a simple resource which is divided into different @@ -58,3 +58,4 @@ public int getCaratRating() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFertilizer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFertilizer.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFertilizer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFertilizer.java index d3a156b741..61644e501d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFertilizer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFertilizer.java @@ -1,16 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.FoodComposter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.TreeGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.FoodComposter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.TreeGrowthAccelerator; /** * {@link OrganicFertilizer} is used to fuel a {@link CropGrowthAccelerator} @@ -32,3 +32,4 @@ public OrganicFertilizer(ItemGroup itemGroup, SlimefunItemStack item, SlimefunIt } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFood.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFood.java similarity index 63% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFood.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFood.java index a9471d0968..ee6577c06a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/OrganicFood.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/OrganicFood.java @@ -1,17 +1,17 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.FoodFabricator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.AnimalGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.FoodFabricator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.AnimalGrowthAccelerator; /** * {@link OrganicFood} is created using a {@link FoodFabricator} and can @@ -31,3 +31,4 @@ public OrganicFood(ItemGroup itemGroup, SlimefunItemStack item, Material ingredi super(itemGroup, item, RecipeType.FOOD_FABRICATOR, new ItemStack[] { SlimefunItems.TIN_CAN.item(), new ItemStack(ingredient), null, null, null, null, null, null, null }, new SlimefunItemStack(item, OUTPUT).item()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SteelThruster.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SteelThruster.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SteelThruster.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SteelThruster.java index 6468b79b19..e8eea512bf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SteelThruster.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SteelThruster.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,13 +6,13 @@ import org.bukkit.entity.Cow; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; /** * The {@link SteelThruster} is a pretty basic crafting component. @@ -46,4 +46,4 @@ private EntityInteractHandler onRightClickEntity() { }; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/StrangeNetherGoo.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/StrangeNetherGoo.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/StrangeNetherGoo.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/StrangeNetherGoo.java index 754a5f88b6..5bdb5122a3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/StrangeNetherGoo.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/StrangeNetherGoo.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import java.util.Optional; @@ -17,17 +17,17 @@ import org.bukkit.potion.PotionEffectType; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.PiglinBarterDrop; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.VillagerRune; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.PiglinBarterDrop; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.VillagerRune; /** * This {@link SlimefunItem} can only be obtained via bartering with a {@link Piglin}, its @@ -90,3 +90,4 @@ private EntityInteractHandler onRightClickEntity() { }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SyntheticEmerald.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SyntheticEmerald.java similarity index 64% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SyntheticEmerald.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SyntheticEmerald.java index b6cd366d01..6f97a53be8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/SyntheticEmerald.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/SyntheticEmerald.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.misc; +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.entity.Villager; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.VillagerTradingListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.VillagerTradingListener; /** * The {@link SyntheticEmerald} is an almost normal emerald. @@ -30,3 +30,4 @@ public SyntheticEmerald(ItemGroup itemGroup, SlimefunItemStack item, RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/package-info.java new file mode 100644 index 0000000000..235d703ae0 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/misc/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds any miscellaneous {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * implementations. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.misc; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractCraftingTable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractCraftingTable.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractCraftingTable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractCraftingTable.java index 0a51c63a96..95bd0e076e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractCraftingTable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractCraftingTable.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.Optional; @@ -20,15 +20,15 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This abstract super class is responsible for some utility methods for machines which @@ -140,3 +140,4 @@ protected void upgradeBackpack(Player p, Inventory inv, SlimefunBackpack backpac } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractSmeltery.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractSmeltery.java index 7f2f27f0cb..fe049cdb60 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AbstractSmeltery.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; @@ -15,14 +15,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.inventory.InvUtils; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; /** @@ -99,3 +99,4 @@ protected void craft(Player p, Block b, Inventory inv, ItemStack[] recipe, ItemS p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/ArmorForge.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/ArmorForge.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/ArmorForge.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/ArmorForge.java index 4a86c04ce3..fb9eb954c2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/ArmorForge.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/ArmorForge.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; @@ -16,13 +16,13 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class ArmorForge extends AbstractCraftingTable { @@ -105,3 +105,4 @@ private void craft(Player p, ItemStack output, Inventory inv, Block dispenser) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AutomatedPanningMachine.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AutomatedPanningMachine.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AutomatedPanningMachine.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AutomatedPanningMachine.java index ca2d0c7124..c34a780706 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AutomatedPanningMachine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/AutomatedPanningMachine.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.ArrayList; import java.util.List; @@ -19,16 +19,16 @@ import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.scheduling.TaskQueue; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.OutputChest; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.NetherGoldPan; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.OutputChest; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.NetherGoldPan; /** * The {@link AutomatedPanningMachine} is a {@link MultiBlockMachine} that @@ -110,3 +110,4 @@ public void onInteract(Player p, Block b) { queue.execute(Slimefun.instance()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Compressor.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Compressor.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Compressor.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Compressor.java index 555c215dad..2bff3db009 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Compressor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Compressor.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.stream.Collectors; @@ -17,15 +17,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class Compressor extends MultiBlockMachine { @@ -113,3 +113,4 @@ private void craft(Player p, ItemStack output, Block dispenser, Inventory dispIn } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/EnhancedCraftingTable.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/EnhancedCraftingTable.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/EnhancedCraftingTable.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/EnhancedCraftingTable.java index 4486197b62..1344a20a17 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/EnhancedCraftingTable.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/EnhancedCraftingTable.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; @@ -15,15 +15,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class EnhancedCraftingTable extends AbstractCraftingTable { @@ -106,3 +106,4 @@ private boolean isCraftable(Inventory inv, ItemStack[] recipe) { return true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/GrindStone.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/GrindStone.java index 754585d8d5..ae14f07e1e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/GrindStone.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.stream.Collectors; @@ -17,16 +17,16 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class GrindStone extends MultiBlockMachine { @@ -153,3 +153,4 @@ public void onInteract(Player p, Block b) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Juicer.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Juicer.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Juicer.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Juicer.java index da99ce748f..34aa963695 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Juicer.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Juicer.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.stream.Collectors; @@ -18,15 +18,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.Juice; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; /** @@ -93,3 +93,4 @@ public void onInteract(Player p, Block b) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MagicWorkbench.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MagicWorkbench.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MagicWorkbench.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MagicWorkbench.java index cd2e0a86ec..099b176a3a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MagicWorkbench.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MagicWorkbench.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; @@ -16,15 +16,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class MagicWorkbench extends AbstractCraftingTable { @@ -149,3 +149,4 @@ private boolean isCraftable(Inventory inv, ItemStack[] recipe) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MakeshiftSmeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MakeshiftSmeltery.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MakeshiftSmeltery.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MakeshiftSmeltery.java index 7405a0694c..7fb6fd30dd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/MakeshiftSmeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/MakeshiftSmeltery.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.ArrayList; import java.util.List; @@ -14,8 +14,8 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; /** * The {@link MakeshiftSmeltery} is a simpler version of the {@link Smeltery}. @@ -55,3 +55,4 @@ protected void craft(Player p, Block b, Inventory inv, ItemStack[] recipe, ItemS } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreCrusher.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreCrusher.java index 07e5df7735..f1d60da182 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreCrusher.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.Arrays; import java.util.List; @@ -19,17 +19,17 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; /** @@ -293,3 +293,4 @@ public void reload() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreWasher.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreWasher.java index b8b7bcae6f..ea4a11b74c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/OreWasher.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -18,14 +18,14 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; /** @@ -189,3 +189,4 @@ private void removeItem(Player p, Block b, Inventory inputInv, @Nullable Invento } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/PressureChamber.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/PressureChamber.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/PressureChamber.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/PressureChamber.java index 50f42828bb..f726e709e3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/PressureChamber.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/PressureChamber.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.List; import java.util.stream.Collectors; @@ -18,14 +18,14 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; public class PressureChamber extends MultiBlockMachine { @@ -99,3 +99,4 @@ private void craft(Player p, Block b, ItemStack output, Inventory dispInv, Block } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Smeltery.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Smeltery.java index 6140929b93..d7f1e436ab 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/Smeltery.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.ArrayList; import java.util.Arrays; @@ -18,13 +18,13 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.IgnitionChamber; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.AlloyIngot; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.IgnitionChamber; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.AlloyIngot; /** * The {@link Smeltery} is an upgraded version of the {@link MakeshiftSmeltery} @@ -98,3 +98,4 @@ private void consumeFire(Player p, Block dispenser, Block b) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/TableSaw.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/TableSaw.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/TableSaw.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/TableSaw.java index 40bb1b2fdd..d40f8d37ab 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/TableSaw.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/TableSaw.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; import java.util.ArrayList; import java.util.List; @@ -20,12 +20,12 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockCraftEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.OutputChest; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockCraftEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.OutputChest; /** * The {@link TableSaw} is an implementation of a {@link MultiBlockMachine} that allows @@ -150,3 +150,4 @@ private void outputItems(@Nonnull Block b, @Nonnull ItemStack output) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java index 5cec6e1b1e..3d22f07de2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -36,3 +36,4 @@ protected void registerDefaultFuelTypes() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/IndustrialMiner.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/IndustrialMiner.java index 77c61ff7b4..46035a746f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/IndustrialMiner.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import java.util.ArrayList; import java.util.HashMap; @@ -23,13 +23,13 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -224,3 +224,4 @@ public boolean canMine(@Nonnull Block block) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MinerStoppingReason.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MinerStoppingReason.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MinerStoppingReason.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MinerStoppingReason.java index 0c54810346..3a03ff6406 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MinerStoppingReason.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MinerStoppingReason.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import javax.annotation.Nonnull; @@ -6,7 +6,7 @@ import org.bukkit.block.data.type.Piston; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; /** * This enum holds various different reasons as to why an {@link IndustrialMiner} @@ -61,3 +61,4 @@ String getErrorMessage() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MiningTask.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MiningTask.java index 0169f0f846..c82e9d1b56 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/MiningTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import java.util.UUID; import java.util.logging.Level; @@ -27,9 +27,9 @@ import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.protection.Interaction; import io.github.bakedlibs.dough.scheduling.TaskQueue; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -392,3 +392,4 @@ private void setExtended(@Nonnull Block block, @Nonnull Piston piston, boolean e } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary.java index 21fb557569..811185dea9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import java.util.Random; @@ -8,7 +8,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; /** * Simple interface to map ore blocks to their respective item(s). @@ -32,3 +32,4 @@ interface OreDictionary { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary16.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary16.java index f69ebc46d6..4fce14629b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary16.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import java.util.Random; @@ -35,3 +35,4 @@ class OreDictionary16 implements OreDictionary { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary17.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary17.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary17.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary17.java index 7db6e3948e..48c1588463 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary17.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/OreDictionary17.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; import java.util.Random; @@ -41,3 +41,4 @@ public ItemStack getDrops(Material material, Random random) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/package-info.java new file mode 100644 index 0000000000..922b38c7cf --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/miner/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds classes associated with the + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner.IndustrialMiner}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/package-info.java new file mode 100644 index 0000000000..78164423ee --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/multiblocks/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains all the different implementations of + * {@link io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlockMachine} + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/package-info.java new file mode 100644 index 0000000000..9d5abdb0c2 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains the different classes for each + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + */ +package io.github.thebusybiscuit.slimefun5.implementation.items; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/ChristmasPresent.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/ChristmasPresent.java index 37ec6cc244..02555f8cda 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/ChristmasPresent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.seasonal; +package io.github.thebusybiscuit.slimefun5.implementation.items.seasonal; import java.util.concurrent.ThreadLocalRandom; @@ -10,16 +10,16 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.FireworkUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.FireworkUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * The {@link ChristmasPresent} is a seasonal {@link SlimefunItem} that drops a random @@ -61,3 +61,4 @@ public ChristmasPresent(ItemGroup itemGroup, SlimefunItemStack item, RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/EasterEgg.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/EasterEgg.java index 2c31638ada..c310179d0a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/EasterEgg.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.seasonal; +package io.github.thebusybiscuit.slimefun5.implementation.items.seasonal; import java.util.concurrent.ThreadLocalRandom; @@ -10,15 +10,15 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.FireworkUtils; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.FireworkUtils; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link SlimefunItem} represents an {@link EasterEgg}. @@ -58,3 +58,4 @@ public EasterEgg(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeT } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/package-info.java similarity index 54% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/package-info.java index 9ddd2c8ba6..234c8943d4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/seasonal/package-info.java @@ -1,6 +1,6 @@ /** - * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} - * that can be encountered in a {@link io.github.thebusybiscuit.slimefun4.api.items.groups.SeasonalItemGroup}. + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that can be encountered in a {@link io.github.thebusybiscuit.slimefun5.api.items.groups.SeasonalItemGroup}. * These items only show up at a certain time of the year. */ -package io.github.thebusybiscuit.slimefun4.implementation.items.seasonal; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.items.seasonal; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/AbstractTeleporterPlate.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/AbstractTeleporterPlate.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/AbstractTeleporterPlate.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/AbstractTeleporterPlate.java index 477444b7e1..d0a4f80b1d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/AbstractTeleporterPlate.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/AbstractTeleporterPlate.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,11 +7,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.TeleporterListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.TeleporterListener; /** * The {@link AbstractTeleporterPlate} is the abstract super class @@ -47,3 +47,4 @@ protected AbstractTeleporterPlate(ItemGroup itemGroup, SlimefunItemStack item, R public abstract boolean hasAccess(@Nonnull Player p, @Nonnull Block block); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PersonalActivationPlate.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PersonalActivationPlate.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PersonalActivationPlate.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PersonalActivationPlate.java index e9fc6dfbb9..95b18fa5ff 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PersonalActivationPlate.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PersonalActivationPlate.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,10 +8,10 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -50,3 +50,4 @@ public boolean hasAccess(Player p, Block b) { return BlockStorage.getLocationInfo(b.getLocation(), "owner").equals(p.getUniqueId().toString()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PortableTeleporter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PortableTeleporter.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PortableTeleporter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PortableTeleporter.java index 2f1261f201..b110df0b6a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/PortableTeleporter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/PortableTeleporter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,15 +7,15 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * This item allows a {@link Player} to access and teleport to his waypoints @@ -58,3 +58,4 @@ public float getMaxItemCharge(ItemStack item) { return CAPACITY; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/SharedActivationPlate.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/SharedActivationPlate.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/SharedActivationPlate.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/SharedActivationPlate.java index 8cf9e163f9..7ac95e5198 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/SharedActivationPlate.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/SharedActivationPlate.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,9 +6,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * The {@link SharedActivationPlate} is a teleporter activation plate @@ -33,3 +33,4 @@ public boolean hasAccess(Player p, Block b) { return true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/Teleporter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/Teleporter.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/Teleporter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/Teleporter.java index 6537a5a85d..8f87544cae 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/Teleporter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/Teleporter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,14 +6,14 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork; -import io.github.thebusybiscuit.slimefun4.api.gps.TeleportationManager; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.gps.GPSNetwork; +import io.github.thebusybiscuit.slimefun5.api.gps.TeleportationManager; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -46,3 +46,4 @@ public void onPlayerPlace(BlockPlaceEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/TeleporterPylon.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/TeleporterPylon.java similarity index 67% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/TeleporterPylon.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/TeleporterPylon.java index ba9e10ecab..f5a6b1e3ba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/TeleporterPylon.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/TeleporterPylon.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter; +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.RainbowTickHandler; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RainbowBlock; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.RainbowTickHandler; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RainbowBlock; /** * The {@link TeleporterPylon} is a special kind of {@link RainbowBlock} which is required @@ -29,3 +29,4 @@ public TeleporterPylon(ItemGroup itemGroup, SlimefunItemStack item, RecipeType r } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/package-info.java new file mode 100644 index 0000000000..9c77ef2274 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/teleporter/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are related to the {@link io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.teleporter; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ClimbingPick.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ClimbingPick.java index dbd9cdad9a..b87736ebdf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ClimbingPick.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.ArrayList; import java.util.Collection; @@ -27,20 +27,20 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.events.ClimbingPickLaunchEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.settings.ClimbableSurface; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.events.ClimbingPickLaunchEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.settings.ClimbableSurface; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * The {@link ClimbingPick} launches you 1 block upwards when you right click @@ -281,3 +281,4 @@ public String getLabelLocalPath() { return "guide.tooltips.recipes.climbing-pick"; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosivePickaxe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosivePickaxe.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosivePickaxe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosivePickaxe.java index ae4d016ca6..dc1250b190 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosivePickaxe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosivePickaxe.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; /** * The {@link ExplosivePickaxe} is a pickaxe which can destroy {@link Block}s @@ -27,3 +27,4 @@ public ExplosivePickaxe(ItemGroup itemGroup, SlimefunItemStack item, RecipeType } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveShovel.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveShovel.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveShovel.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveShovel.java index 784d8c897b..c4f794c82d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveShovel.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveShovel.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,11 +8,11 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * The {@link ExplosiveShovel} works similar to the {@link ExplosivePickaxe}. @@ -37,3 +37,4 @@ protected boolean canBreak(@Nonnull Player p, Block b) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveTool.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveTool.java index 59fcd86d00..92de2f4609 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/ExplosiveTool.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -20,21 +20,21 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.events.ExplosiveToolBreakBlocksEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -222,3 +222,4 @@ private BlockExplodeEvent createNewBlockExplodeEvent( } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GoldPan.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GoldPan.java index e8bd5c99d6..7530e741d3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GoldPan.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.ArrayList; import java.util.Arrays; @@ -20,21 +20,21 @@ import io.github.bakedlibs.dough.collections.RandomizedSet; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricGoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.AutomatedPanningMachine; -import io.github.thebusybiscuit.slimefun4.implementation.settings.GoldPanDrop; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricGoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.AutomatedPanningMachine; +import io.github.thebusybiscuit.slimefun5.implementation.settings.GoldPanDrop; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * A {@link GoldPan} is a {@link SlimefunItem} which allows you to obtain various @@ -225,3 +225,4 @@ public boolean isValidInputMaterial(@Nonnull Material material) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GrapplingHook.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GrapplingHook.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GrapplingHook.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GrapplingHook.java index 0caf733724..43e43e39ce 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GrapplingHook.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/GrapplingHook.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.UUID; @@ -15,16 +15,16 @@ import org.bukkit.util.Vector; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.GrapplingHookListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.GrapplingHookListener; /** * The {@link GrapplingHook} is a simple {@link SlimefunItem} which allows a {@link Player} @@ -90,3 +90,4 @@ public GrapplingHook(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/LumberAxe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/LumberAxe.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/LumberAxe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/LumberAxe.java index faf6e0a44d..a7dfed813d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/LumberAxe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/LumberAxe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.List; @@ -16,14 +16,14 @@ import io.github.bakedlibs.dough.blocks.Vein; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -109,3 +109,4 @@ private void breakLog(@Nonnull Block b) { b.setType(Material.AIR); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/NetherGoldPan.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/NetherGoldPan.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/NetherGoldPan.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/NetherGoldPan.java index 18c996547a..cc54ff0d83 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/NetherGoldPan.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/NetherGoldPan.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.Arrays; import java.util.HashSet; @@ -10,10 +10,10 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.settings.GoldPanDrop; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.settings.GoldPanDrop; /** * The {@link NetherGoldPan} is a variant of the regular {@link GoldPan} @@ -58,3 +58,4 @@ public Material getInputMaterial() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfContainment.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfContainment.java index 86499f2bee..d01e7cd0ac 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfContainment.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,17 +10,17 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.AbstractMonsterSpawner; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BrokenSpawner; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RepairedSpawner; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.AbstractMonsterSpawner; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BrokenSpawner; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RepairedSpawner; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -82,3 +82,4 @@ public PickaxeOfContainment(ItemGroup itemGroup, SlimefunItemStack item, RecipeT } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfTheSeeker.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfTheSeeker.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfTheSeeker.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfTheSeeker.java index 1aab6007c7..28f06fd764 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfTheSeeker.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfTheSeeker.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,16 +10,16 @@ import org.bukkit.event.Event.Result; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * The {@link PickaxeOfTheSeeker} will make you face the nearest ore upon right clicking. @@ -101,3 +101,4 @@ public boolean isDamageable() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfVeinMining.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfVeinMining.java index 41a293a7f3..a66a241af1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PickaxeOfVeinMining.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.List; @@ -15,15 +15,15 @@ import io.github.bakedlibs.dough.blocks.Vein; import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * The {@link PickaxeOfVeinMining} is a powerful tool which allows you to mine an entire vein of ores @@ -73,3 +73,4 @@ private void breakBlocks(Player p, List blocks, int fortune, ItemStack to } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableCrafter.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableCrafter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableCrafter.java index 3cf3443d4f..6216283167 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableCrafter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,13 +8,13 @@ import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link PortableCrafter} is one of the oldest items in Slimefun. @@ -41,3 +41,4 @@ public PortableCrafter(ItemGroup itemGroup, SlimefunItemStack item, RecipeType r }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableDustbin.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableDustbin.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableDustbin.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableDustbin.java index 0b21792473..4ba38fbb2c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PortableDustbin.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/PortableDustbin.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -9,14 +9,14 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.TrashCan; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.TrashCan; /** * The {@link PortableDustbin} is one of the oldest items in Slimefun. @@ -44,3 +44,4 @@ public PortableDustbin(ItemGroup itemGroup, SlimefunItemStack item, RecipeType r }; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/SmeltersPickaxe.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/SmeltersPickaxe.java index 3f5f051c44..7ea25035ac 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/SmeltersPickaxe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.Collection; import java.util.Optional; @@ -10,14 +10,14 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -73,3 +73,4 @@ public boolean isDamageable() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TapeMeasure.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TapeMeasure.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TapeMeasure.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TapeMeasure.java index db94cdfa86..53b6122408 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TapeMeasure.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TapeMeasure.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.text.DecimalFormat; import java.util.Optional; @@ -18,15 +18,15 @@ import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; /** * The {@link TapeMeasure} is used to measure the distance between two {@link Block Blocks}. @@ -129,3 +129,4 @@ private void measure(Player p, ItemStack item, Block block) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/package-info.java new file mode 100644 index 0000000000..2f1d301f09 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/package-info.java @@ -0,0 +1,5 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are tools. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/ExplosiveBow.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/ExplosiveBow.java index 1477549c9f..acd3daf4d0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/ExplosiveBow.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/ExplosiveBow.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import java.util.Collection; @@ -15,13 +15,13 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; /** * The {@link ExplosiveBow} is a {@link SlimefunBow} which creates a fake explosion when it hits @@ -81,3 +81,4 @@ private boolean canDamage(@Nonnull Entity entity) { return entity instanceof LivingEntity && !(entity instanceof ArmorStand) && entity.isValid(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/IcyBow.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/IcyBow.java index b3e54f15ed..415f9e5e7f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/IcyBow.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,12 +10,12 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; /** * The {@link IcyBow} is a special kind of bow which slows down any @@ -54,3 +54,4 @@ public BowShootHandler onShoot() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SeismicAxe.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SeismicAxe.java index 93d9095c03..312b761ff6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SeismicAxe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import java.util.HashSet; import java.util.List; @@ -25,14 +25,14 @@ import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link SeismicAxe} is an interesting weapon. It spawns ghostly block entities in a straight line @@ -169,3 +169,4 @@ public boolean isDamageable() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SlimefunBow.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SlimefunBow.java similarity index 70% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SlimefunBow.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SlimefunBow.java index 09ffcdbe49..345f678fb9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SlimefunBow.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SlimefunBow.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,11 +6,11 @@ import org.bukkit.entity.Arrow; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; /** * This class represents a {@link SlimefunItem} that is a Bow. @@ -37,3 +37,4 @@ public void preRegister() { public abstract BowShootHandler onShoot(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SwordOfBeheading.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SwordOfBeheading.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SwordOfBeheading.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SwordOfBeheading.java index ce40980ded..63debcba68 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SwordOfBeheading.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/SwordOfBeheading.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @@ -17,15 +17,15 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityKillHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityKillHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; /** * The {@link SwordOfBeheading} is a special kind of sword which allows you to obtain @@ -104,3 +104,4 @@ public EntityKillHandler getItemHandler() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/VampireBlade.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/VampireBlade.java similarity index 68% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/VampireBlade.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/VampireBlade.java index 006db130e2..d8db2b736f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/VampireBlade.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/VampireBlade.java @@ -1,23 +1,23 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.weapons; +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; import java.util.concurrent.ThreadLocalRandom; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.WeaponUseHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.settings.IntRangeSetting; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.handlers.WeaponUseHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.SimpleSlimefunItem; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedAttribute; /** * The {@link VampireBlade} is a weapon that applies a Healing effect to any {@link Player} @@ -45,7 +45,7 @@ public VampireBlade(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci if (ThreadLocalRandom.current().nextInt(100) < getChance()) { SoundEffect.VAMPIRE_BLADE_HEALING_SOUND.playFor(p); double health = p.getHealth() + HEALING_AMOUNT; - double maxHealth = p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); + double maxHealth = p.getAttribute(VersionedAttribute.MAX_HEALTH).getValue(); p.setHealth(Math.min(health, maxHealth)); } }; @@ -60,3 +60,4 @@ public int getChance() { return chance.getValue(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/package-info.java new file mode 100644 index 0000000000..254b9289e6 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/items/weapons/package-info.java @@ -0,0 +1,6 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} + * that are weapons, implementations of + * {@link io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SlimefunBow} for example. + */ +package io.github.thebusybiscuit.slimefun5.implementation.items.weapons; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AncientAltarListener.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AncientAltarListener.java index 81b66442a3..d99b30e92c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AncientAltarListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.HashSet; @@ -30,18 +30,18 @@ import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AltarRecipe; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RepairedSpawner; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.AncientAltarTask; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AltarRecipe; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RepairedSpawner; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.AncientAltarTask; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -365,3 +365,4 @@ public void onItemDespawn(ItemDespawnEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AutoCrafterListener.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AutoCrafterListener.java index 9dddeb628d..e48f98768d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/AutoCrafterListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.Optional; @@ -15,13 +15,13 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.AbstractAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.EnhancedAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.VanillaAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Multimeter; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.AbstractAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.EnhancedAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.VanillaAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Multimeter; /** * This {@link Listener} is responsible for providing interactions to the auto crafters. @@ -101,3 +101,4 @@ private boolean hasUnlockedRecipe(Player p, ItemStack item) { return true; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BackpackListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BackpackListener.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BackpackListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BackpackListener.java index cb6b5ce070..faec323c1e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BackpackListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BackpackListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.HashMap; @@ -26,13 +26,13 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; /** * This {@link Listener} is responsible for all events centered around a {@link SlimefunBackpack}. @@ -213,3 +213,4 @@ public void setBackpackId(@Nonnull OfflinePlayer backpackOwner, @Nonnull ItemSta item.setItemMeta(im); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BeeWingsListener.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BeeWingsListener.java index 987409d561..e31bc8a1ef 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BeeWingsListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.event.entity.EntityToggleGlideEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.BeeWings; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.BeeWingsTask; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.BeeWings; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.BeeWingsTask; /** * This {@link Listener} is responsible for the slow falling effect given to the {@link Player} @@ -49,3 +49,4 @@ public void onApproachGround(EntityToggleGlideEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockListener.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockListener.java index 40b976e345..d714887d84 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.List; @@ -29,18 +29,18 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockBreakEvent; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.events.ExplosiveToolBreakBlocksEvent; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunBlockBreakEvent; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunBlockPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockPlaceHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ToolUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -388,3 +388,4 @@ private int getBonusDropsWithFortune(@Nullable ItemStack item, @Nonnull Block b) return amount; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockPhysicsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockPhysicsListener.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockPhysicsListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockPhysicsListener.java index d63289aa46..66efd1882f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockPhysicsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/BlockPhysicsListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -19,8 +19,8 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -113,3 +113,4 @@ public void onBucketUse(PlayerBucketEmptyEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ButcherAndroidListener.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ButcherAndroidListener.java index 9e63107680..2360d9ef4b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ButcherAndroidListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.List; @@ -19,10 +19,10 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.AndroidInstance; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.ButcherAndroid; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.AndroidInstance; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.ButcherAndroid; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link Listener} handles the collection of drops from an {@link Entity} that was @@ -94,3 +94,4 @@ private void addExtraDrops(List drops, EntityType entityType) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CargoNodeListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CargoNodeListener.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CargoNodeListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CargoNodeListener.java index 0cb86a6d9b..2bc2dc2953 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CargoNodeListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CargoNodeListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoNode; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoNode; /** * This {@link Listener} is solely responsible for preventing Cargo Nodes from being placed @@ -39,3 +39,4 @@ private boolean isCargoNode(@Nonnull ItemStack item) { return SlimefunItem.getByItem(item) instanceof CargoNode; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CoolerListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CoolerListener.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CoolerListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CoolerListener.java index d8c62a9370..2377ccfb2e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/CoolerListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/CoolerListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -15,13 +15,13 @@ import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.events.CoolerFeedPlayerEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice; +import io.github.thebusybiscuit.slimefun5.api.events.CoolerFeedPlayerEvent; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.Juice; /** * This {@link Listener} listens for a {@link FoodLevelChangeEvent} or an {@link EntityDamageEvent} for starvation @@ -137,3 +137,4 @@ private boolean consumeJuice(@Nonnull Player p, @Nonnull ItemStack coolerItem, @ } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DeathpointListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DeathpointListener.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DeathpointListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DeathpointListener.java index fe81796953..0ac5d741cf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DeathpointListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DeathpointListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -12,9 +12,9 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link Listener} listens to the {@link EntityDeathEvent} to automatically @@ -40,3 +40,4 @@ public void onDeath(PlayerDeathEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DebugFishListener.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DebugFishListener.java index 6bcbffd93b..45e5e708a7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DebugFishListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.EnumSet; import java.util.Set; @@ -21,16 +21,16 @@ import org.bukkit.inventory.EquipmentSlot; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.bakedlibs.dough.skins.PlayerHead; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetComponent; +import io.github.thebusybiscuit.slimefun5.core.attributes.EnergyNetProvider; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -95,7 +95,7 @@ private void onRightClick(Player p, Block b, BlockFace face) { Block block = b.getRelative(face); block.setType(Material.PLAYER_HEAD); - PlayerHead.setSkin(block, HeadTexture.MISSING_TEXTURE.getAsSkin(), true); + VersionedPlayerHead.setSkin(block, HeadTexture.MISSING_TEXTURE.getBase64Texture(), true); SoundEffect.DEBUG_FISH_CLICK_SOUND.playFor(p); }, 2L); } else if (BlockStorage.hasBlockInfo(b)) { @@ -184,3 +184,4 @@ private void sendInfo(Player p, Block b) { p.sendMessage(" "); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DispenserListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DispenserListener.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DispenserListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DispenserListener.java index 9989508348..07e2dff37e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DispenserListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/DispenserListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -12,9 +12,9 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.BlockDispenseEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockDispenseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -57,3 +57,4 @@ public void onBlockDispensing(BlockDispenseEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ElytraImpactListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ElytraImpactListener.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ElytraImpactListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ElytraImpactListener.java index 02fc80c56c..efd5d3676d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ElytraImpactListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ElytraImpactListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.HashSet; import java.util.Optional; @@ -15,14 +15,14 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.ElytraCap; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.ElytraCap; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; import org.bukkit.event.entity.EntityToggleGlideEvent; /** @@ -87,3 +87,4 @@ public void onPlayerCrash(EntityDamageEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/EnhancedFurnaceListener.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/EnhancedFurnaceListener.java index c03e238c4a..127bfe966b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/EnhancedFurnaceListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.Optional; @@ -15,10 +15,10 @@ import org.bukkit.inventory.FurnaceInventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.EnhancedFurnace; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.EnhancedFurnace; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import io.papermc.lib.PaperLib; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -94,3 +94,4 @@ public void onItemSmelt(FurnaceSmeltEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ExplosionsListener.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ExplosionsListener.java index 786fdd4973..762afed373 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ExplosionsListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.Iterator; @@ -19,10 +19,10 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.WitherProof; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.WitherProof; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -107,3 +107,4 @@ private void handleExplosion(BlockBreakHandler handler, Block block) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GadgetsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GadgetsListener.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GadgetsListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GadgetsListener.java index 2b38db7769..6e844f8c56 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GadgetsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GadgetsListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -8,18 +8,18 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerToggleSneakEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.Parachute; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.JetBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Jetpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.InfusedMagnet; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.InfusedMagnetTask; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.JetBootsTask; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.JetpackTask; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.player.ParachuteTask; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.Parachute; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.JetBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Jetpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.InfusedMagnet; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.InfusedMagnetTask; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.JetBootsTask; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.JetpackTask; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.player.ParachuteTask; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link Listener} is responsible for listening to the {@link PlayerToggleSneakEvent} @@ -91,3 +91,4 @@ private void handleBoots(@Nonnull Player p, @Nullable SlimefunItem boots) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookEntity.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookEntity.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookEntity.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookEntity.java index 13aac08291..b0072f0374 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookEntity.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookEntity.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,7 +10,7 @@ import org.bukkit.entity.Item; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; final class GrapplingHookEntity { @@ -50,4 +50,4 @@ public void remove() { } } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookListener.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookListener.java index fe57d8197a..c8662aa674 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GrapplingHookListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/GrapplingHookListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.HashMap; import java.util.HashSet; @@ -28,9 +28,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GrapplingHook; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GrapplingHook; /** * This {@link Listener} is responsible for the mechanics behind the {@link GrapplingHook}. @@ -219,3 +219,4 @@ public void addGrapplingHook(Player p, Arrow arrow, Bat bat, boolean dropItem, l }, despawnTicks); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/HopperListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/HopperListener.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/HopperListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/HopperListener.java index bf63a4990c..9e2db0ed76 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/HopperListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/HopperListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,8 +8,8 @@ import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.inventory.InventoryType; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotHopperable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -38,3 +38,4 @@ public void onHopperInsert(InventoryMoveItemEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemDropListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemDropListener.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemDropListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemDropListener.java index 647102801a..288b51a1ab 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemDropListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemDropListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -6,10 +6,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerDropItemEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemDropHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.core.SlimefunRegistry; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemDropHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * Listens to the {@link PlayerDropItemEvent} to call any {@link ItemDropHandler}. @@ -35,3 +35,4 @@ public void onItemDrop(PlayerDropItemEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemPickupListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemPickupListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemPickupListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemPickupListener.java index 678c1f2c4b..6622d0f99b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ItemPickupListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/ItemPickupListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.event.inventory.InventoryPickupItemEvent; import org.bukkit.inventory.meta.ItemMeta; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * Listens to the ItemPickup events to prevent it if the item has the "no_pickup" metadata or is an ALTAR_PROBE. @@ -51,3 +51,4 @@ public void onHopperPickup(InventoryPickupItemEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/JoinListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/JoinListener.java similarity index 74% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/JoinListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/JoinListener.java index 28d15851bd..64be3924d4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/JoinListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/JoinListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,12 +8,12 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.armor.RadiationTask; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.armor.RadiationTask; /** * This {@link Listener} caches the armor of the player on join. @@ -42,3 +42,4 @@ public void onJoin(@Nonnull PlayerJoinEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiddleClickListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiddleClickListener.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiddleClickListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiddleClickListener.java index b35d48292b..79c687764c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiddleClickListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiddleClickListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -12,8 +12,8 @@ import org.bukkit.event.inventory.InventoryCreativeEvent; import org.bukkit.event.inventory.InventoryType.SlotType; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -101,3 +101,4 @@ private boolean isActualMiddleClick(InventoryCreativeEvent e, Block b) { return isOutsideInventoryClick || isPlayerWallhead; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiningAndroidListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiningAndroidListener.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiningAndroidListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiningAndroidListener.java index e83370f5a6..f126d6572e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiningAndroidListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MiningAndroidListener.java @@ -1,14 +1,14 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidMineEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.AndroidMineEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -44,3 +44,4 @@ public void onAndroidMine(AndroidMineEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MultiBlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MultiBlockListener.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MultiBlockListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MultiBlockListener.java index 7e11ac124a..6515418184 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MultiBlockListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MultiBlockListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.LinkedList; @@ -18,10 +18,10 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.EquipmentSlot; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockInteractEvent; -import io.github.thebusybiscuit.slimefun4.core.handlers.MultiBlockInteractionHandler; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockInteractEvent; +import io.github.thebusybiscuit.slimefun5.core.handlers.MultiBlockInteractionHandler; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} is responsible for listening to a {@link PlayerInteractEvent} and @@ -108,3 +108,4 @@ private boolean equals(Material a, Material b) { return false; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/NetworkListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/NetworkListener.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/NetworkListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/NetworkListener.java index 3d68b22d19..c775bee61b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/NetworkListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/NetworkListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -9,10 +9,10 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.ExplosiveToolBreakBlocksEvent; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} is responsible for all updates to a {@link Network}. @@ -54,3 +54,4 @@ public void onExplosiveToolUse(ExplosiveToolBreakBlocksEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PlayerProfileListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/PlayerProfileListener.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PlayerProfileListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/PlayerProfileListener.java index f303a1a592..0f88e07270 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PlayerProfileListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/PlayerProfileListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.Optional; @@ -11,8 +11,8 @@ import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerQuitEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} removes a {@link PlayerProfile} from memory if the corresponding {@link Player} @@ -45,3 +45,4 @@ public void onKick(PlayerKickEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/RadioactivityListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/RadioactivityListener.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/RadioactivityListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/RadioactivityListener.java index 319185bd36..799ccaa73c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/RadioactivityListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/RadioactivityListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -6,9 +6,9 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.armor.RadiationTask; -import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.armor.RadiationTask; +import io.github.thebusybiscuit.slimefun5.utils.RadiationUtils; /** * {@link RadioactivityListener} handles radioactivity level resets @@ -28,3 +28,4 @@ public void onPlayerDeath(@Nonnull PlayerDeathEvent e) { RadiationTask.addGracePeriod(e.getEntity()); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SeismicAxeListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SeismicAxeListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SeismicAxeListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SeismicAxeListener.java index ee5c106e7a..660895160e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SeismicAxeListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SeismicAxeListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,8 +8,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SeismicAxe; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SeismicAxe; /** * This {@link Listener} is responsible for removing every {@link FallingBlock} that was @@ -42,3 +42,4 @@ public void onBlockFall(EntityChangeBlockEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBootsListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBootsListener.java index 10f981cd77..ff8f18a021 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBootsListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -16,13 +16,13 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.player.PlayerInteractEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.EnderBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.FarmerShoes; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.LongFallBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.StomperBoots; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.EnderBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.FarmerShoes; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.LongFallBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.StomperBoots; /** * This {@link Listener} is responsible for handling all boots provided by @@ -94,3 +94,4 @@ public void onTrample(PlayerInteractEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBowListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBowListener.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBowListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBowListener.java index 286bd2c2e0..dc2b2b0fc1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBowListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunBowListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.HashMap; import java.util.Map; @@ -17,10 +17,10 @@ import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.entity.ProjectileHitEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SlimefunBow; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SlimefunBow; /** * This {@link Listener} is responsible for tracking {@link Arrow Arrows} fired from a @@ -82,3 +82,4 @@ public void onArrowSuccessfulHit(EntityDamageByEntityEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunGuideListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunGuideListener.java index 53897013a2..6d99e25296 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunGuideListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -12,13 +12,13 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunGuideOpenEvent; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.core.guide.options.SlimefunGuideSettings; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunGuideOpenEvent; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.core.guide.options.SlimefunGuideSettings; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; public class SlimefunGuideListener implements Listener { @@ -95,3 +95,4 @@ private Result tryOpenGuide(Player p, PlayerRightClickEvent e, SlimefunGuideMode } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemConsumeListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemConsumeListener.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemConsumeListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemConsumeListener.java index 2a62ead3fe..ffcdb8322b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemConsumeListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemConsumeListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} is responsible for handling the {@link ItemConsumptionHandler} @@ -40,3 +40,4 @@ public void onConsume(PlayerItemConsumeEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemHitListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemHitListener.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemHitListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemHitListener.java index 621040f9ea..de7be19422 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemHitListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemHitListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; @@ -9,9 +9,9 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.WeaponUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.WeaponUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} is responsible for calling the {@link WeaponUseHandler}. @@ -46,3 +46,4 @@ public void onDamage(EntityDamageByEntityEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemInteractListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemInteractListener.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemInteractListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemInteractListener.java index ce3f951743..e3a27db56e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunItemInteractListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SlimefunItemInteractListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.Optional; @@ -17,13 +17,13 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BlockUseHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -170,3 +170,4 @@ private void openInventory(Player p, SlimefunItem item, Block clickedBlock, Play } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SoulboundListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SoulboundListener.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SoulboundListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SoulboundListener.java index b57a4802a7..8b7ae382f7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SoulboundListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/SoulboundListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.HashMap; import java.util.Map; @@ -13,9 +13,9 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link Listener} is responsible for handling any {@link Soulbound} items. @@ -75,3 +75,4 @@ private void returnSoulboundItems(@Nonnull Player p) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TalismanListener.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TalismanListener.java index 893fb0ab75..b3c3b727a8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TalismanListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.ArrayList; import java.util.Collection; @@ -10,7 +10,7 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -44,13 +44,13 @@ import org.bukkit.util.Vector; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.MagicianTalisman; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman; -import io.github.thebusybiscuit.slimefun4.implementation.settings.TalismanEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.MagicianTalisman; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman; +import io.github.thebusybiscuit.slimefun5.implementation.settings.TalismanEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * This {@link Listener} is responsible for handling any {@link Event} @@ -401,3 +401,4 @@ private int getAmountWithFortune(@Nonnull Material type, int fortuneLevel) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TeleporterListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TeleporterListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TeleporterListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TeleporterListener.java index 7260828b1d..2d8c298703 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TeleporterListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TeleporterListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.UUID; @@ -13,13 +13,13 @@ import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.elevator.ElevatorPlate; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.AbstractTeleporterPlate; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.TeleporterPylon; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.elevator.ElevatorPlate; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.AbstractTeleporterPlate; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.TeleporterPylon; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -95,4 +95,4 @@ private boolean checkForPylons(@Nonnull Block teleporter) { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/VillagerTradingListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/VillagerTradingListener.java index eaeefa06c9..3a6b2cd85b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/VillagerTradingListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -12,10 +12,10 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.SyntheticEmerald; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.SyntheticEmerald; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used to trade with @@ -57,3 +57,4 @@ private boolean isUnallowed(@Nullable SlimefunItem item) { return item != null && !(item instanceof VanillaItem) && !(item instanceof SyntheticEmerald) && !item.isDisabled(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/WorldListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/WorldListener.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/WorldListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/WorldListener.java index 0bdedf9991..3c9b37aa45 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/WorldListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/WorldListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.logging.Level; @@ -9,7 +9,7 @@ import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -37,3 +37,4 @@ public void onWorldUnload(WorldUnloadEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/AnvilListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/AnvilListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/AnvilListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/AnvilListener.java index 16e28fdbee..f99dc7f68e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/AnvilListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/AnvilListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -10,8 +10,8 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in an @@ -40,3 +40,4 @@ public void onAnvil(InventoryClickEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/BrewingStandListener.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/BrewingStandListener.java index 47ab4f1eb4..d2464aa13b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/BrewingStandListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/BrewingStandListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -13,8 +13,8 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -61,3 +61,4 @@ public void hopperOnBrew(InventoryMoveItemEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CartographyTableListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CartographyTableListener.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CartographyTableListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CartographyTableListener.java index 1eed58c935..7e89424626 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CartographyTableListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CartographyTableListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -10,8 +10,8 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -40,3 +40,4 @@ public void onCartographyTable(InventoryClickEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CauldronListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CauldronListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CauldronListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CauldronListener.java index 9dc642a67e..1c16484143 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CauldronListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CauldronListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -11,9 +11,9 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -50,3 +50,4 @@ public void onCauldronUse(PlayerInteractEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CraftingTableListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CraftingTableListener.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CraftingTableListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CraftingTableListener.java index 928a3f58bc..61e99b9d55 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/CraftingTableListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/CraftingTableListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -10,8 +10,8 @@ import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -54,3 +54,4 @@ public void onPrepareCraft(PrepareItemCraftEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/GrindstoneListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/GrindstoneListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/GrindstoneListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/GrindstoneListener.java index f8d3e18653..7bd5ef1a64 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/GrindstoneListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/GrindstoneListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -10,8 +10,8 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -40,3 +40,4 @@ public void onGrindstone(InventoryClickEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SlimefunCraftingListener.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SlimefunCraftingListener.java index ae51e614b5..d4819dae8a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SlimefunCraftingListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SlimefunCraftingListener.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nullable; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; interface SlimefunCraftingListener extends Listener { @@ -35,3 +35,4 @@ default boolean isUnallowed(@Nullable SlimefunItem item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SmithingTableListener.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SmithingTableListener.java index dd1567f778..5ac9f13847 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/SmithingTableListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; import javax.annotation.Nonnull; @@ -8,9 +8,9 @@ import org.bukkit.event.inventory.PrepareSmithingEvent; import org.bukkit.event.inventory.SmithItemEvent; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents any {@link SlimefunItem} from being used in a @@ -52,3 +52,4 @@ private int materialSlot() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/package-info.java similarity index 53% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/package-info.java index 0d777f3773..d4b365f0f4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/crafting/package-info.java @@ -1,5 +1,5 @@ /** * This package holds every {@link org.bukkit.event.Listener} which is responsible for preventing that a - * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} is used in an unallowed crafting operation + * {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} is used in an unallowed crafting operation */ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/BeeListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/BeeListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/BeeListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/BeeListener.java index 89c762c496..858807c17c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/BeeListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/BeeListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import java.util.Optional; @@ -12,9 +12,9 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * The {@link Listener} for Hazmat Suit's {@link Bee} sting protection. @@ -55,3 +55,4 @@ public void onDamage(EntityDamageByEntityEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/EntityInteractionListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/EntityInteractionListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/EntityInteractionListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/EntityInteractionListener.java index db90d17b8c..c93a834afd 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/EntityInteractionListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/EntityInteractionListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import javax.annotation.Nonnull; @@ -10,10 +10,10 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityInteractHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityInteractHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * The {@link Listener} responsible for a {@link Player} interacting with an {@link Entity}. @@ -59,4 +59,4 @@ public void onInteractEntity(PlayerInteractEntityEvent e) { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/FireworksListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/FireworksListener.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/FireworksListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/FireworksListener.java index 66f7291b02..13c991ed0f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/FireworksListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/FireworksListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import javax.annotation.Nonnull; @@ -10,8 +10,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.meta.FireworkMeta; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} makes sure that any {@link Firework} caused by a {@link Player} @@ -44,3 +44,4 @@ public void onResearchFireworkDamage(EntityDamageByEntityEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/IronGolemListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/IronGolemListener.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/IronGolemListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/IronGolemListener.java index 1357362746..b31d35b31c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/IronGolemListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/IronGolemListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import javax.annotation.Nonnull; @@ -12,9 +12,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; /** * This {@link Listener} makes sure that an {@link IronGolem} cannot be healed with @@ -64,3 +64,4 @@ public void onIronGolemHeal(PlayerInteractEntityEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/MobDropListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/MobDropListener.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/MobDropListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/MobDropListener.java index 7d69ffc900..0ac4a0da93 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/MobDropListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/MobDropListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; @@ -12,12 +12,12 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RandomMobDrop; -import io.github.thebusybiscuit.slimefun4.core.handlers.EntityKillHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.BasicCircuitBoard; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RandomMobDrop; +import io.github.thebusybiscuit.slimefun5.core.handlers.EntityKillHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.BasicCircuitBoard; /** * This {@link Listener} is responsible for handling any custom mob drops. @@ -85,3 +85,4 @@ private boolean canDrop(@Nonnull Player p, @Nonnull ItemStack item) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/PiglinListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/PiglinListener.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/PiglinListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/PiglinListener.java index bb153b299e..99d7bb9e12 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/PiglinListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/PiglinListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; @@ -17,9 +17,9 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.PiglinBarterDrop; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.PiglinBarterDrop; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This {@link Listener} prevents a {@link Piglin} from bartering with a @@ -104,3 +104,4 @@ public void onPiglinDropItem(EntityDropItemEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/WitherListener.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/WitherListener.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/WitherListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/WitherListener.java index 4d6b314521..9c9b6b8945 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/WitherListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/WitherListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; import javax.annotation.Nonnull; @@ -8,10 +8,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.WitherProof; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.WitherProof; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -44,3 +44,4 @@ public void onWitherDestroy(EntityChangeBlockEvent e) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/package-info.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/package-info.java index 8ace561cee..a3548c97eb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/entity/package-info.java @@ -2,4 +2,4 @@ * This package contains any {@link org.bukkit.event.Listener} from Slimefun which is related to an * {@link org.bukkit.entity.Entity}. */ -package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.listeners.entity; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/package-info.java similarity index 61% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/package-info.java index bb235157a0..7862072ace 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all implementations of {@link org.bukkit.event.Listener} that Slimefun uses. */ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.listeners; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/CraftingOperation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/CraftingOperation.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/CraftingOperation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/CraftingOperation.java index 410664e314..f661849041 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/CraftingOperation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/CraftingOperation.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.operations; +package io.github.thebusybiscuit.slimefun5.implementation.operations; import javax.annotation.Nonnull; import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -62,3 +62,4 @@ public int getTotalTicks() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/FuelOperation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/FuelOperation.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/FuelOperation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/FuelOperation.java index a86fd1991e..a4e7c226da 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/FuelOperation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/FuelOperation.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.operations; +package io.github.thebusybiscuit.slimefun5.implementation.operations; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -6,7 +6,7 @@ import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; @@ -64,3 +64,4 @@ public int getTotalTicks() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/GEOMiningOperation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/GEOMiningOperation.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/GEOMiningOperation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/GEOMiningOperation.java index 372f9f502c..61b596917c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/GEOMiningOperation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/GEOMiningOperation.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.operations; +package io.github.thebusybiscuit.slimefun5.implementation.operations; import java.util.OptionalInt; import javax.annotation.Nonnull; import io.github.bakedlibs.dough.blocks.BlockPosition; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.api.geo.ResourceManager; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.geo.ResourceManager; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; /** * This {@link MachineOperation} represents a {@link GEOMiner} @@ -40,3 +40,4 @@ public void onCancel(@Nonnull BlockPosition position) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/MiningOperation.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/MiningOperation.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/MiningOperation.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/MiningOperation.java index e7f94c98bf..4d10c58b02 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/operations/MiningOperation.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/MiningOperation.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.operations; +package io.github.thebusybiscuit.slimefun5.implementation.operations; import javax.annotation.Nonnull; import org.apache.commons.lang.Validate; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; +import io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation; /** * This {@link MachineOperation} represents an operation @@ -56,3 +56,4 @@ public int getTotalTicks() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/package-info.java new file mode 100644 index 0000000000..773eea782e --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/operations/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains implementations of {@link io.github.thebusybiscuit.slimefun5.core.machines.MachineOperation}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.operations; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/package-info.java similarity index 65% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/package-info.java index 24b8a2ca26..07fc1426bf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/package-info.java @@ -1,6 +1,6 @@ /** * This package holds all classes that are related to the actual implementation of this plugin. - * This includes implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} but also any + * This includes implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem} but also any * {@link org.bukkit.event.Listener}. */ -package io.github.thebusybiscuit.slimefun4.implementation; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/AbstractResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/AbstractResource.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/AbstractResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/AbstractResource.java index cfe995787f..b2d4565de0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/AbstractResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/AbstractResource.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; import java.util.logging.Level; @@ -11,10 +11,10 @@ import com.google.gson.JsonElement; -import io.github.thebusybiscuit.slimefun4.api.exceptions.BiomeMapException; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.api.exceptions.BiomeMapException; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * This is an abstract parent class for any {@link GEOResource} @@ -106,3 +106,4 @@ public boolean isObtainableFromGEOMiner() { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/GEOResourcesSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/GEOResourcesSetup.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/GEOResourcesSetup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/GEOResourcesSetup.java index a731b9df2d..64b4215223 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/GEOResourcesSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/GEOResourcesSetup.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; /** * This static setup class is used to register all default instances of @@ -21,3 +21,4 @@ public static void setup() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/NetherIceResource.java similarity index 76% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/NetherIceResource.java index 360761091f..e1f581071a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/NetherIceResource.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; import org.bukkit.World.Environment; import org.bukkit.block.Biome; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * A {@link GEOResource} which consists of nether ice. @@ -36,3 +36,4 @@ public int getDefaultSupply(Environment environment, Biome biome) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/OilResource.java similarity index 69% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/OilResource.java index 0407e65ec8..f8a9e756ad 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/OilResource.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; import org.bukkit.World.Environment; import org.bukkit.block.Biome; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.OilPump; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.OilPump; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * A {@link GEOResource} which consists of buckets of Oil. @@ -49,3 +49,4 @@ public int getDefaultSupply(Environment environment, Biome biome) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/SaltResource.java similarity index 75% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/SaltResource.java index 32a6294885..b9ceacbd1a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/SaltResource.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; import org.bukkit.World.Environment; import org.bukkit.block.Biome; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * A {@link GEOResource} which consists of Salt. @@ -46,3 +46,4 @@ public int getDefaultSupply(Environment environment, Biome biome) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/UraniumResource.java similarity index 77% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/UraniumResource.java index 9791258c20..5956a6c39d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/UraniumResource.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.resources; +package io.github.thebusybiscuit.slimefun5.implementation.resources; import org.bukkit.World.Environment; import org.bukkit.block.Biome; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.biomes.BiomeMap; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap; /** * A {@link GEOResource} which consists of small chunks of Uranium. @@ -47,3 +47,4 @@ public int getDefaultSupply(Environment environment, Biome biome) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/package-info.java new file mode 100644 index 0000000000..4133616f1d --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/resources/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains all implementations of {@link io.github.thebusybiscuit.slimefun5.api.geo.GEOResource}. + */ +package io.github.thebusybiscuit.slimefun5.implementation.resources; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/ClimbableSurface.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/ClimbableSurface.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/ClimbableSurface.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/ClimbableSurface.java index 1e850c9624..ce68cf559a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/ClimbableSurface.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/ClimbableSurface.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.settings; +package io.github.thebusybiscuit.slimefun5.implementation.settings; import javax.annotation.Nonnull; import org.bukkit.Material; -import io.github.thebusybiscuit.slimefun4.api.events.ClimbingPickLaunchEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.settings.DoubleRangeSetting; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ClimbingPick; +import io.github.thebusybiscuit.slimefun5.api.events.ClimbingPickLaunchEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.settings.DoubleRangeSetting; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ClimbingPick; /** * This is an {@link ItemSetting} that manages the efficiency of climbing @@ -50,3 +50,4 @@ public Material getType() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/GoldPanDrop.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/GoldPanDrop.java similarity index 81% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/GoldPanDrop.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/GoldPanDrop.java index f114c580e5..04de17f7ba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/GoldPanDrop.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/GoldPanDrop.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.implementation.settings; +package io.github.thebusybiscuit.slimefun5.implementation.settings; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; public class GoldPanDrop extends ItemSetting { @@ -37,4 +37,4 @@ public void update(Integer newValue) { goldPan.updateRandomizer(); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/TalismanEnchantment.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/TalismanEnchantment.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/TalismanEnchantment.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/TalismanEnchantment.java index 3dd005f9c6..871600bb3f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/settings/TalismanEnchantment.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/TalismanEnchantment.java @@ -1,13 +1,13 @@ -package io.github.thebusybiscuit.slimefun4.implementation.settings; +package io.github.thebusybiscuit.slimefun5.implementation.settings; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.enchantments.Enchantment; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.MagicianTalisman; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.TalismanListener; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.MagicianTalisman; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.TalismanListener; /** * This class is an extension of {@link ItemSetting} that holds an {@link Enchantment} and @@ -49,4 +49,4 @@ public int getLevel() { return level; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/package-info.java new file mode 100644 index 0000000000..06c4dcac21 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/settings/package-info.java @@ -0,0 +1,6 @@ +/** + * This package holds implementations of {@link io.github.thebusybiscuit.slimefun5.api.items.ItemSetting} that are for + * very specific {@link io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem SlimefunItems} and generally not + * very useful out of their context. + */ +package io.github.thebusybiscuit.slimefun5.implementation.settings; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/DefaultItemGroups.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/DefaultItemGroups.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/DefaultItemGroups.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/DefaultItemGroups.java index 3d23b19dce..3c7ed3cdc0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/DefaultItemGroups.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/DefaultItemGroups.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.setup; +package io.github.thebusybiscuit.slimefun5.implementation.setup; import java.time.Month; @@ -6,15 +6,15 @@ import org.bukkit.NamespacedKey; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.SeasonalItemGroup; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.LockedItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.SeasonalItemGroup; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This class holds a reference to every {@link ItemGroup} @@ -67,3 +67,4 @@ class DefaultItemGroups { // Flex Item Groups protected final FlexItemGroup rickFlexGroup = new RickFlexGroup(new NamespacedKey(Slimefun.instance(), "rick")); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/PostSetup.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/PostSetup.java index ce8694bd31..553eba96ec 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/PostSetup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.setup; +package io.github.thebusybiscuit.slimefun5.implementation.setup; import java.io.BufferedReader; import java.io.IOException; @@ -24,15 +24,15 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunItemRegistryFinalizedEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.GrindStone; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.MakeshiftSmeltery; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.OreCrusher; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunItemRegistryFinalizedEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.GrindStone; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.MakeshiftSmeltery; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.OreCrusher; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; @@ -99,10 +99,10 @@ public static void loadItems() { if (Slimefun.getUpdater().getBranch().isOfficial()) { sender.sendMessage(""); - sender.sendMessage(ChatColor.GREEN + " - Source Code: https://github.com/Slimefun/Slimefun4"); - sender.sendMessage(ChatColor.GREEN + " - Wiki: https://github.com/Slimefun/Slimefun4/wiki"); - sender.sendMessage(ChatColor.GREEN + " - Addons: https://github.com/Slimefun/Slimefun4/wiki/Addons"); - sender.sendMessage(ChatColor.GREEN + " - Bug Reports: https://github.com/Slimefun/Slimefun4/issues"); + sender.sendMessage(ChatColor.GREEN + " - Source Code: https://github.com/Slimefun5/Slimefun5"); + sender.sendMessage(ChatColor.GREEN + " - Wiki: https://github.com/Slimefun5/Slimefun5/wiki"); + sender.sendMessage(ChatColor.GREEN + " - Addons: https://github.com/Slimefun5/Slimefun5/wiki/Addons"); + sender.sendMessage(ChatColor.GREEN + " - Bug Reports: https://github.com/Slimefun5/Slimefun5/issues"); sender.sendMessage(ChatColor.GREEN + " - Discord: https://discord.gg/slimefun"); } else { sender.sendMessage(ChatColor.GREEN + " - UNOFFICIALLY MODIFIED BUILD - NO OFFICIAL SUPPORT GIVEN"); @@ -240,3 +240,4 @@ private static void registerMachineRecipe(String machine, int seconds, ItemStack } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/ResearchSetup.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/ResearchSetup.java index 0ad68ea14e..d3dec9a0ce 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/ResearchSetup.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.setup; +package io.github.thebusybiscuit.slimefun5.implementation.setup; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; import java.util.Arrays; @@ -329,3 +329,4 @@ private static void register(String key, int id, String name, int defaultCost, S research.register(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/RickFlexGroup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/RickFlexGroup.java similarity index 78% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/RickFlexGroup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/RickFlexGroup.java index 914a7b517f..760536fd20 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/RickFlexGroup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/RickFlexGroup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.setup; +package io.github.thebusybiscuit.slimefun5.implementation.setup; import java.time.LocalDate; import java.time.Month; @@ -10,10 +10,10 @@ import org.bukkit.entity.Player; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.utils.ChatUtils; /** * A super ordinary class. @@ -46,3 +46,4 @@ public void open(Player p, PlayerProfile profile, SlimefunGuideMode layout) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/SlimefunItemSetup.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/SlimefunItemSetup.java index 2448331bec..63cfcff99c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/SlimefunItemSetup.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.setup; +package io.github.thebusybiscuit.slimefun5.implementation.setup; import java.util.ArrayList; import java.util.List; @@ -17,207 +17,207 @@ import org.bukkit.potion.PotionType; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.core.handlers.RainbowTickHandler; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.EnchantedItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.HiddenItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.RadioactiveItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.AndroidInterface; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.ButcherAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.FarmerAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.FishermanAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.MinerAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.ProgrammableAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.WoodcutterAndroid; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.ElytraCap; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.EnderBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.FarmerShoes; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.HazmatArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.LongFallBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.Parachute; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.RainbowArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.StomperBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.ArmorAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.EnhancedAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.VanillaAutoCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.EnderBackpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.RestoredBackpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SoulboundBackpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BrokenSpawner; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.Composter; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.Crucible; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.EnhancedFurnace; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.HardenedGlass; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.HologramProjector; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.IgnitionChamber; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.OutputChest; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RainbowBlock; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.RepairedSpawner; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.UnplaceableBlock; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.WitherProofBlock; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.AdvancedCargoOutputNode; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoConnectorNode; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoInputNode; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoManager; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoOutputNode; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.ReactorAccessPort; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.TrashCan; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.Capacitor; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.EnergyConnector; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.EnergyRegulator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.JetBoots; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Jetpack; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.MultiTool; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Multimeter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.BioGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.CoalGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.CombustionGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.LavaGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.MagnesiumGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.AutoAnvil; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.AutoBrewer; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.AutoDrier; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.CarbonPress; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ChargingBench; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricDustWasher; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricFurnace; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricGoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricIngotFactory; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricIngotPulverizer; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricOreGrinder; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricPress; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricSmeltery; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectrifiedCrucible; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.FluidPump; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.FoodComposter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.FoodFabricator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.Freezer; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.HeatedPressureChamber; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.Refinery; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.AnimalGrowthAccelerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.TreeGrowthAccelerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoDisenchanter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoEnchanter; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.BookBinder; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.AutoBreeder; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.ExpCollector; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.IronGolemAssembler; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.ProduceCollector; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.WitherAssembler; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NetherStarReactor; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NuclearReactor; -import io.github.thebusybiscuit.slimefun4.implementation.items.elevator.ElevatorPlate; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.BirthdayCake; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.DietCookie; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.FortuneCookie; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.HeavyCream; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.MagicSugar; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.MeatJerky; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.MonsterJerky; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.OilPump; -import io.github.thebusybiscuit.slimefun4.implementation.items.geo.PortableGEOScanner; -import io.github.thebusybiscuit.slimefun4.implementation.items.gps.GPSControlPanel; -import io.github.thebusybiscuit.slimefun4.implementation.items.gps.GPSMarkerTool; -import io.github.thebusybiscuit.slimefun4.implementation.items.gps.GPSTransmitter; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.BeeWings; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.InfernalBonemeal; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.InfusedHopper; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.InfusedMagnet; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.KnowledgeFlask; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.KnowledgeTome; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.MagicEyeOfEnder; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.MagicalZombiePills; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.SoulboundItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.TelepositionScroll; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.ElementalRune; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.EnchantmentRune; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.SoulboundRune; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes.VillagerRune; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.StormStaff; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.WaterStaff; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.WindStaff; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.MagicianTalisman; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman; -import io.github.thebusybiscuit.slimefun4.implementation.items.medical.Bandage; -import io.github.thebusybiscuit.slimefun4.implementation.items.medical.Medicine; -import io.github.thebusybiscuit.slimefun4.implementation.items.medical.Splint; -import io.github.thebusybiscuit.slimefun4.implementation.items.medical.Vitamins; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.AlloyIngot; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.BasicCircuitBoard; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.CoolantCell; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.GoldIngot; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.OrganicFertilizer; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.OrganicFood; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.SteelThruster; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.StrangeNetherGoo; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.SyntheticEmerald; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.ArmorForge; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.AutomatedPanningMachine; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Compressor; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.EnhancedCraftingTable; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.GrindStone; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Juicer; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.MagicWorkbench; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.MakeshiftSmeltery; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.OreCrusher; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.OreWasher; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.PressureChamber; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.TableSaw; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.AdvancedIndustrialMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.IndustrialMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.ChristmasPresent; -import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.EasterEgg; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.PersonalActivationPlate; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.PortableTeleporter; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.SharedActivationPlate; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter; -import io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.TeleporterPylon; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ClimbingPick; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosivePickaxe; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosiveShovel; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GrapplingHook; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.LumberAxe; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.NetherGoldPan; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfContainment; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfTheSeeker; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfVeinMining; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PortableCrafter; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PortableDustbin; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.SmeltersPickaxe; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.TapeMeasure; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.ExplosiveBow; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.IcyBow; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SeismicAxe; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SwordOfBeheading; -import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.VampireBlade; -import io.github.thebusybiscuit.slimefun4.utils.ColoredMaterial; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.core.handlers.RainbowTickHandler; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.EnchantedItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.HiddenItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.RadioactiveItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.AndroidInterface; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.ButcherAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.FarmerAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.FishermanAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.MinerAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.ProgrammableAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.WoodcutterAndroid; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.ElytraCap; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.EnderBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.FarmerShoes; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.HazmatArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.LongFallBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.Parachute; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.RainbowArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.StomperBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.ArmorAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.EnhancedAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.VanillaAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.EnderBackpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.RestoredBackpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SoulboundBackpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BrokenSpawner; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.Composter; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.Crucible; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.EnhancedFurnace; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.HardenedGlass; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.HologramProjector; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.IgnitionChamber; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.OutputChest; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RainbowBlock; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.RepairedSpawner; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.UnplaceableBlock; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.WitherProofBlock; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.AdvancedCargoOutputNode; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoConnectorNode; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoInputNode; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoManager; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoOutputNode; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.ReactorAccessPort; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.TrashCan; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.Capacitor; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.EnergyConnector; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.EnergyRegulator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.JetBoots; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Jetpack; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.MultiTool; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Multimeter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.SolarHelmet; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.BioGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.CoalGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.CombustionGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.LavaGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.MagnesiumGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.generators.SolarGenerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.AutoAnvil; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.AutoBrewer; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.AutoDrier; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.CarbonPress; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ChargingBench; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricDustWasher; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricFurnace; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricGoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricIngotFactory; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricIngotPulverizer; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricOreGrinder; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricPress; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricSmeltery; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectrifiedCrucible; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.FluidPump; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.FoodComposter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.FoodFabricator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.Freezer; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.HeatedPressureChamber; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.Refinery; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.AnimalGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.TreeGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoDisenchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoEnchanter; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.BookBinder; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.AutoBreeder; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.ExpCollector; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.IronGolemAssembler; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.ProduceCollector; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.entities.WitherAssembler; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.NetherStarReactor; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.reactors.NuclearReactor; +import io.github.thebusybiscuit.slimefun5.implementation.items.elevator.ElevatorPlate; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.BirthdayCake; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.DietCookie; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.FortuneCookie; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.HeavyCream; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.Juice; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.MagicSugar; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.MeatJerky; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.MonsterJerky; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.GEOScanner; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.OilPump; +import io.github.thebusybiscuit.slimefun5.implementation.items.geo.PortableGEOScanner; +import io.github.thebusybiscuit.slimefun5.implementation.items.gps.GPSControlPanel; +import io.github.thebusybiscuit.slimefun5.implementation.items.gps.GPSMarkerTool; +import io.github.thebusybiscuit.slimefun5.implementation.items.gps.GPSTransmitter; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.BeeWings; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.InfernalBonemeal; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.InfusedHopper; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.InfusedMagnet; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.KnowledgeFlask; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.KnowledgeTome; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.MagicEyeOfEnder; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.MagicalZombiePills; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.SoulboundItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.TelepositionScroll; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.ElementalRune; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.EnchantmentRune; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.SoulboundRune; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.runes.VillagerRune; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.StormStaff; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.WaterStaff; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.WindStaff; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.MagicianTalisman; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman; +import io.github.thebusybiscuit.slimefun5.implementation.items.medical.Bandage; +import io.github.thebusybiscuit.slimefun5.implementation.items.medical.Medicine; +import io.github.thebusybiscuit.slimefun5.implementation.items.medical.Splint; +import io.github.thebusybiscuit.slimefun5.implementation.items.medical.Vitamins; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.AlloyIngot; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.BasicCircuitBoard; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.CoolantCell; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.GoldIngot; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.OrganicFertilizer; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.OrganicFood; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.SteelThruster; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.StrangeNetherGoo; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.SyntheticEmerald; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.ArmorForge; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.AutomatedPanningMachine; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Compressor; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.EnhancedCraftingTable; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.GrindStone; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Juicer; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.MagicWorkbench; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.MakeshiftSmeltery; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.OreCrusher; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.OreWasher; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.PressureChamber; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.Smeltery; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.TableSaw; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner.AdvancedIndustrialMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner.IndustrialMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.seasonal.ChristmasPresent; +import io.github.thebusybiscuit.slimefun5.implementation.items.seasonal.EasterEgg; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.PersonalActivationPlate; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.PortableTeleporter; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.SharedActivationPlate; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.Teleporter; +import io.github.thebusybiscuit.slimefun5.implementation.items.teleporter.TeleporterPylon; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ClimbingPick; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ExplosivePickaxe; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ExplosiveShovel; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GrapplingHook; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.LumberAxe; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.NetherGoldPan; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfContainment; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfTheSeeker; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfVeinMining; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PortableCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PortableDustbin; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.SmeltersPickaxe; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.TapeMeasure; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.ExplosiveBow; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.IcyBow; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SeismicAxe; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.SwordOfBeheading; +import io.github.thebusybiscuit.slimefun5.implementation.items.weapons.VampireBlade; +import io.github.thebusybiscuit.slimefun5.utils.ColoredMaterial; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; /** * This class holds the recipes of all items. @@ -2741,3 +2741,4 @@ private static void registerArmorSet(ItemGroup itemGroup, ItemStack baseComponen } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/package-info.java similarity index 53% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/package-info.java index ad5bd0fb4c..09b6cfda03 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/setup/package-info.java @@ -1,4 +1,4 @@ /** * In this package we initialize our items, researches and stuff. */ -package io.github.thebusybiscuit.slimefun4.implementation.setup; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.setup; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AncientAltarTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AncientAltarTask.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AncientAltarTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AncientAltarTask.java index be256b0031..8391543467 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AncientAltarTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AncientAltarTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.Collection; import java.util.HashMap; @@ -20,14 +20,14 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.AncientAltarCraftEvent; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedParticle; +import io.github.thebusybiscuit.slimefun5.api.events.AncientAltarCraftEvent; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientAltar; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.AncientAltarListener; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedParticle; /** * The {@link AncientAltarTask} is responsible for the animation that happens when a ritual @@ -184,3 +184,4 @@ private void finish() { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/ArmorTask.java similarity index 89% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/ArmorTask.java index d0ab1ec05b..aa97ca6b03 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/ArmorTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.Collections; import java.util.HashSet; @@ -17,17 +17,17 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedPotionEffectType; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.SolarHelmet; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPotionEffectType; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; /** * The {@link ArmorTask} is responsible for handling {@link PotionEffect PotionEffects} for @@ -191,3 +191,4 @@ private boolean checkAndApplyRadiation(@Nonnull Player p, @Nullable ItemStack it return false; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AsyncRecipeChoiceTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AsyncRecipeChoiceTask.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AsyncRecipeChoiceTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AsyncRecipeChoiceTask.java index 9ac00aa3ca..361e549141 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/AsyncRecipeChoiceTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/AsyncRecipeChoiceTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.HashMap; import java.util.Map; @@ -17,8 +17,8 @@ import org.bukkit.inventory.RecipeChoice.MaterialChoice; import io.github.bakedlibs.dough.collections.LoopIterator; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; /** * A {@link AsyncRecipeChoiceTask} is an asynchronously repeating task that cycles @@ -126,3 +126,4 @@ public void run() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/CapacitorTextureUpdateTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/CapacitorTextureUpdateTask.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/CapacitorTextureUpdateTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/CapacitorTextureUpdateTask.java index 4f79580831..05cfb335ca 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/CapacitorTextureUpdateTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/CapacitorTextureUpdateTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import javax.annotation.Nonnull; @@ -8,10 +8,9 @@ import org.bukkit.Server; import org.bukkit.block.Block; -import io.github.bakedlibs.dough.skins.PlayerHead; -import io.github.bakedlibs.dough.skins.PlayerSkin; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.Capacitor; -import io.github.thebusybiscuit.slimefun4.utils.HeadTexture; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.Capacitor; +import io.github.thebusybiscuit.slimefun5.utils.HeadTexture; import io.papermc.lib.PaperLib; /** @@ -75,10 +74,10 @@ public void run() { } private void setTexture(@Nonnull Block b, @Nonnull HeadTexture texture) { - PlayerSkin skin = PlayerSkin.fromHashCode(texture.getUniqueId(), texture.getTexture()); - PlayerHead.setSkin(b, skin, false); + VersionedPlayerHead.setSkinFromHash(b, texture.getUniqueId(), texture.getTexture(), false); PaperLib.getBlockState(b, false).getState().update(true, false); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/SlimefunStartupTask.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/SlimefunStartupTask.java index 4802161951..2c7d091945 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/SlimefunStartupTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.logging.Level; @@ -7,11 +7,11 @@ import org.bukkit.Bukkit; import org.bukkit.World; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.TeleporterListener; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.WorldListener; -import io.github.thebusybiscuit.slimefun4.implementation.setup.PostSetup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.TeleporterListener; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.WorldListener; +import io.github.thebusybiscuit.slimefun5.implementation.setup.PostSetup; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -81,3 +81,4 @@ private boolean isEnabled(String... itemIds) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TickerTask.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TickerTask.java index 91525994fb..e8c3814325 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TickerTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.Collection; import java.util.Collections; @@ -23,9 +23,9 @@ import io.github.bakedlibs.dough.blocks.BlockPosition; import io.github.bakedlibs.dough.blocks.ChunkPosition; -import io.github.thebusybiscuit.slimefun4.api.ErrorReport; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.ErrorReport; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -388,3 +388,4 @@ public void disableTicker(@Nonnull Location l) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/AbstractArmorTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/AbstractArmorTask.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/AbstractArmorTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/AbstractArmorTask.java index 179e905f14..eb1d3614b6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/AbstractArmorTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/AbstractArmorTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.armor; import java.util.logging.Level; @@ -10,8 +10,8 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This is a base class for any ArmorTask, it checks every online player @@ -77,3 +77,4 @@ protected void onTick() { @ParametersAreNonnullByDefault protected abstract void onPlayerTick(Player p, PlayerProfile profile); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RadiationTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RadiationTask.java similarity index 88% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RadiationTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RadiationTask.java index 85e4c4bfe8..1403acae9f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RadiationTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RadiationTask.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.armor; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.events.RadiationDamageEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.RadiationSymptom; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.RadioactivityListener; -import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils; +import io.github.thebusybiscuit.slimefun5.api.events.RadiationDamageEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.RadiationSymptom; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.RadioactivityListener; +import io.github.thebusybiscuit.slimefun5.utils.RadiationUtils; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ComponentBuilder; @@ -137,3 +137,4 @@ public static void addGracePeriod(@Nonnull Player player) { ACTIVE_GRACE_PERIODS.put(player.getUniqueId(), System.currentTimeMillis() + (GRACE_PERIOD_DURATION * 1000L)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RainbowArmorTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RainbowArmorTask.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RainbowArmorTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RainbowArmorTask.java index 7df8b7e846..0d9cd4414a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RainbowArmorTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/RainbowArmorTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.armor; import javax.annotation.ParametersAreNonnullByDefault; @@ -7,9 +7,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.LeatherArmorMeta; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.RainbowArmorPiece; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.RainbowArmorPiece; /** * The {@link RainbowArmorTask} is responsible for handling the change in color of any Rainbow Armor piece. @@ -54,3 +54,4 @@ private void updateRainbowArmor(ItemStack itemStack, RainbowArmorPiece armorPiec } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SlimefunArmorTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SlimefunArmorTask.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SlimefunArmorTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SlimefunArmorTask.java index ce21846923..fb4e0ec40b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SlimefunArmorTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SlimefunArmorTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.armor; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,12 +6,12 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; /** * The {@link SlimefunArmorTask} is responsible for handling {@link SlimefunArmorPiece} @@ -77,3 +77,4 @@ protected void onArmorPieceTick(Player p, SlimefunArmorPiece sfArmorPiece, ItemS } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SolarHelmetTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SolarHelmetTask.java similarity index 79% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SolarHelmetTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SolarHelmetTask.java index 7b28b60fe2..bdcc4f143e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SolarHelmetTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/armor/SolarHelmetTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.armor; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -8,11 +8,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.SolarHelmet; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * The {@link SolarHelmetTask} is responsible for handling {@link SolarHelmet} for generating power @@ -52,3 +52,4 @@ private boolean hasSunlight(@Nonnull Player p) { return (world.getTime() < 12300 || world.getTime() > 23850) && p.getEyeLocation().getBlock().getLightFromSky() == 15; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/package-info.java similarity index 54% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/package-info.java index 2935ec8cb9..efb44b70f0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/package-info.java @@ -1,4 +1,4 @@ /** * This package contains several tasks that Slimefun runs regularly. */ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.implementation.tasks; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/AbstractPlayerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/AbstractPlayerTask.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/AbstractPlayerTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/AbstractPlayerTask.java index 03744889bd..0a689847b8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/AbstractPlayerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/AbstractPlayerTask.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import javax.annotation.Nonnull; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; abstract class AbstractPlayerTask implements Runnable { @@ -59,3 +59,4 @@ protected boolean isValid() { protected abstract void executeTask(); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/BeeWingsTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/BeeWingsTask.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/BeeWingsTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/BeeWingsTask.java index 662f8c6dcb..705141d00a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/BeeWingsTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/BeeWingsTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import javax.annotation.Nonnull; @@ -9,9 +9,9 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.BeeWings; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BeeWingsListener; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.BeeWings; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BeeWingsListener; /** * This task is responsible for the repeating checks for our {@link BeeWings}. @@ -100,3 +100,4 @@ protected boolean isValid() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/InfusedMagnetTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/InfusedMagnetTask.java similarity index 87% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/InfusedMagnetTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/InfusedMagnetTask.java index 091f59ddec..83c5a4e6f7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/InfusedMagnetTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/InfusedMagnetTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import javax.annotation.Nonnull; @@ -7,9 +7,9 @@ import org.bukkit.entity.Item; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.InfusedMagnet; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.InfusedMagnet; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; /** * This {@link AbstractPlayerTask} is run when a {@link Player} carries an {@link InfusedMagnet}. @@ -64,3 +64,4 @@ protected boolean isValid() { return super.isValid() && p.getGameMode() != GameMode.SPECTATOR; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetBootsTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetBootsTask.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetBootsTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetBootsTask.java index c11c01184e..ea4f8321f7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetBootsTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetBootsTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import java.util.concurrent.ThreadLocalRandom; @@ -10,9 +10,9 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.JetBoots; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.JetBoots; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; public class JetBootsTask extends AbstractPlayerTask { @@ -47,3 +47,4 @@ protected void executeTask() { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetpackTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetpackTask.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetpackTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetpackTask.java index 40c119943e..4672923075 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/JetpackTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/JetpackTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import javax.annotation.Nonnull; @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Jetpack; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.gadgets.Jetpack; public class JetpackTask extends AbstractPlayerTask { @@ -42,3 +42,4 @@ protected void executeTask() { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/ParachuteTask.java b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/ParachuteTask.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/ParachuteTask.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/ParachuteTask.java index 94382753d5..2dcd275030 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/player/ParachuteTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/player/ParachuteTask.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks.player; +package io.github.thebusybiscuit.slimefun5.implementation.tasks.player; import javax.annotation.Nonnull; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.Parachute; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.Parachute; /** * The {@link ParachuteTask} adds the entire functionality of the {@link Parachute}. @@ -36,3 +36,4 @@ protected void executeTask() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/ClearLagIntegration.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/ClearLagIntegration.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/ClearLagIntegration.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/ClearLagIntegration.java index bd9da15a1a..a85bc736fb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/ClearLagIntegration.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/ClearLagIntegration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import java.util.Iterator; @@ -9,8 +9,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; import me.minebuilders.clearlag.Clearlag; import me.minebuilders.clearlag.events.EntityRemoveEvent; @@ -47,3 +47,4 @@ public void onEntityRemove(EntityRemoveEvent e) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/IntegrationsManager.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/IntegrationsManager.java index 5063884c56..693269d513 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/IntegrationsManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import java.util.function.Consumer; import java.util.logging.Level; @@ -19,9 +19,9 @@ import com.gmail.nossr50.util.skills.SkillUtils; import io.github.bakedlibs.dough.protection.ProtectionManager; -import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.AutoDisenchanter; +import io.github.thebusybiscuit.slimefun5.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.enchanting.AutoDisenchanter; import dev.lone.itemsadder.api.ItemsAdder; @@ -311,3 +311,4 @@ public boolean isOrebfuscatorInstalled() { return isOrebfuscatorInstalled; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/McMMOIntegration.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/McMMOIntegration.java index 6b9f2cf28e..83e1dfafff 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/McMMOIntegration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import javax.annotation.Nonnull; @@ -11,11 +11,11 @@ import com.gmail.nossr50.events.skills.salvage.McMMOPlayerSalvageCheckEvent; import com.gmail.nossr50.util.skills.SkillUtils; -import io.github.thebusybiscuit.slimefun4.api.events.AutoDisenchantEvent; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.api.events.AutoDisenchantEvent; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; /** * This handles all integrations with {@link mcMMO}. @@ -79,3 +79,4 @@ private boolean isSalvageable(@Nonnull ItemStack item) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/OrebfuscatorIntegration.java similarity index 83% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/OrebfuscatorIntegration.java index f9982fec2e..4699a8c0d8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/OrebfuscatorIntegration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import java.util.Arrays; import java.util.HashSet; @@ -13,12 +13,12 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import io.github.thebusybiscuit.slimefun4.api.events.BlockPlacerPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.events.ReactorExplodeEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; +import io.github.thebusybiscuit.slimefun5.api.events.BlockPlacerPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.events.ExplosiveToolBreakBlocksEvent; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.events.ReactorExplodeEvent; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.GoldPan; import net.imprex.orebfuscator.api.OrebfuscatorService; @@ -72,3 +72,4 @@ public void onGoldPanUse(PlayerRightClickEvent event) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/PlaceholderAPIIntegration.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/PlaceholderAPIIntegration.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/PlaceholderAPIIntegration.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/PlaceholderAPIIntegration.java index 826fb1e4b5..df8eac66c3 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/PlaceholderAPIIntegration.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/PlaceholderAPIIntegration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import java.util.Optional; import java.util.Set; @@ -10,9 +10,9 @@ import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.expansion.PlaceholderExpansion; @@ -144,3 +144,4 @@ private String getProfilePlaceholder(@Nonnull Player p) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/WorldEditIntegration.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/WorldEditIntegration.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/WorldEditIntegration.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/WorldEditIntegration.java index 5ebb4ad1bb..c3455718dc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/WorldEditIntegration.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/WorldEditIntegration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.integrations; +package io.github.thebusybiscuit.slimefun5.integrations; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -62,3 +62,4 @@ public > boolean setBlock(BlockVector3 pos, T bloc } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/package-info.java similarity index 66% rename from src/main/java/io/github/thebusybiscuit/slimefun4/integrations/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/integrations/package-info.java index 61c871610c..ce999458e5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/integrations/package-info.java @@ -1,4 +1,4 @@ /** * This package holds classes which are related to integrations between Slimefun and Third-Party plugins. */ -package io.github.thebusybiscuit.slimefun4.integrations; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.integrations; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/Storage.java b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/Storage.java similarity index 84% rename from src/main/java/io/github/thebusybiscuit/slimefun4/storage/Storage.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/storage/Storage.java index 037db2afc3..310d37ce83 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/Storage.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/Storage.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.storage; +package io.github.thebusybiscuit.slimefun5.storage; -import io.github.thebusybiscuit.slimefun4.storage.data.PlayerData; +import io.github.thebusybiscuit.slimefun5.storage.data.PlayerData; import javax.annotation.concurrent.ThreadSafe; @@ -24,3 +24,4 @@ public interface Storage { void savePlayerData(UUID uuid, PlayerData data); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/backend/legacy/LegacyStorage.java b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/backend/legacy/LegacyStorage.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/storage/backend/legacy/LegacyStorage.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/storage/backend/legacy/LegacyStorage.java index f051a3b846..eb1dd30200 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/backend/legacy/LegacyStorage.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/backend/legacy/LegacyStorage.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.storage.backend.legacy; +package io.github.thebusybiscuit.slimefun5.storage.backend.legacy; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.storage.Storage; -import io.github.thebusybiscuit.slimefun4.storage.data.PlayerData; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.storage.Storage; +import io.github.thebusybiscuit.slimefun5.storage.data.PlayerData; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -145,3 +145,4 @@ public void savePlayerData(@Nonnull UUID uuid, @Nonnull PlayerData data) { Slimefun.getAnalyticsService().recordPlayerProfileDataTime("legacy", false, end - start); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/data/PlayerData.java b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/data/PlayerData.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/storage/data/PlayerData.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/storage/data/PlayerData.java index 8615b6ee5f..323797b6b9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/storage/data/PlayerData.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/storage/data/PlayerData.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.storage.data; +package io.github.thebusybiscuit.slimefun5.storage.data; import com.google.common.annotations.Beta; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; import java.util.HashMap; import java.util.HashSet; @@ -16,7 +16,7 @@ import org.apache.commons.lang.Validate; /** - * The data which backs {@link io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile} + * The data which backs {@link io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile} * * This API is still experimental, it may change without notice. */ @@ -94,3 +94,4 @@ public void removeWaypoint(@Nonnull Waypoint waypoint) { waypoints.remove(waypoint); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ArmorStandUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ArmorStandUtils.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/ArmorStandUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/ArmorStandUtils.java index e2cf5ae10f..911b8fb760 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ArmorStandUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ArmorStandUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import javax.annotation.Nonnull; @@ -6,9 +6,9 @@ import org.bukkit.Location; import org.bukkit.entity.ArmorStand; -import io.github.thebusybiscuit.slimefun4.core.services.holograms.HologramsService; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.HologramProjector; +import io.github.thebusybiscuit.slimefun5.core.services.holograms.HologramsService; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.HologramProjector; /** * This class holds utilities for {@link ArmorStand}, useful for classes @@ -72,3 +72,4 @@ private static void setupArmorStand(ArmorStand armorStand) { armorStand.setRemoveWhenFarAway(false); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChargeUtils.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChargeUtils.java index 9c23ff0075..3033d8f930 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChargeUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -16,8 +16,8 @@ import org.bukkit.persistence.PersistentDataType; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This is just a simple helper class to provide static methods to the {@link Rechargeable} @@ -91,3 +91,4 @@ public static float getCharge(@Nonnull ItemMeta meta) { return 0; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChatUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChatUtils.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChatUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChatUtils.java index 829e5891c3..c9803d3b86 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChatUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChatUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Locale; import java.util.function.Consumer; @@ -12,7 +12,7 @@ import io.github.bakedlibs.dough.chat.ChatInput; import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This utility class contains a few static methods that are all about {@link String} manipulation @@ -103,3 +103,4 @@ public static void awaitInput(@Nonnull Player p, @Nonnull Consumer callb } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChestMenuUtils.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChestMenuUtils.java index dc31cf2b76..f78cfc1468 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ChestMenuUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Arrays; import java.util.List; @@ -11,15 +11,15 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler; @@ -35,7 +35,7 @@ private ChestMenuUtils() {} private static final ItemStack NO_PERMISSION = new SlimefunItemStack("_UI_NO_PERMISSION", Material.BARRIER, "No Permission").item(); private static final ItemStack NOT_RESEARCHED = new SlimefunItemStack("_UI_NOT_RESEARCHED", Material.BARRIER, "Not researched").item(); - private static final ItemStack BACK_BUTTON = new SlimefunItemStack("_UI_BACK", Material.ENCHANTED_BOOK, "&7\u21E6 Back", meta -> meta.addItemFlags(ItemFlag.HIDE_ENCHANTS)).item(); + private static final ItemStack BACK_BUTTON = new SlimefunItemStack("_UI_BACK", Material.ENCHANTED_BOOK, "&7\u21E6 Back", meta -> VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ENCHANTS)).item(); private static final ItemStack MENU_BUTTON = new SlimefunItemStack("_UI_MENU", Material.COMPARATOR, "&eSettings / Info", "", "&7\u21E8 Click to see more").item(); private static final ItemStack SEARCH_BUTTON = new SlimefunItemStack("_UI_SEARCH", Material.NAME_TAG, "&bSearch").item(); private static final ItemStack WIKI_BUTTON = new SlimefunItemStack("_UI_WIKI", Material.KNOWLEDGE_BOOK, "&3Slimefun Wiki").item(); @@ -154,7 +154,7 @@ public static void updateProgressbar(@Nonnull ChestMenu menu, int slot, int time ItemStack item = indicator.clone(); ItemMeta im = item.getItemMeta(); - im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); + VersionedItemFlag.addFlags(im, VersionedItemFlag.HIDE_ATTRIBUTES); if (im instanceof Damageable damageable) { damageable.setDamage(getDurability(item, timeLeft, time)); @@ -194,3 +194,4 @@ private static short getDurability(@Nonnull ItemStack item, int timeLeft, int ma } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ColoredMaterial.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ColoredMaterial.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/ColoredMaterial.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/ColoredMaterial.java index 9fe766e5e0..bbf3f7ea67 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ColoredMaterial.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/ColoredMaterial.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Arrays; import java.util.Collections; @@ -10,7 +10,7 @@ import org.bukkit.DyeColor; import org.bukkit.Material; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; /** * This class holds a few ordered {@link List Lists} that hold colored variants @@ -261,3 +261,4 @@ public enum ColoredMaterial { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FileUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/FileUtils.java similarity index 91% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/FileUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/FileUtils.java index f8441dc75e..b1fccfa021 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FileUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/FileUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.io.File; @@ -22,3 +22,4 @@ public static boolean deleteDirectory(File folder) { return folder.delete(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/FireworkUtils.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/FireworkUtils.java index e09851349d..f608d8d184 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/FireworkUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @@ -15,7 +15,7 @@ import org.bukkit.entity.Firework; import org.bukkit.inventory.meta.FireworkMeta; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEntityType; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEntityType; /** * This is a simple utility class for spawning random and colorful {@link Firework} rockets. @@ -97,3 +97,4 @@ public static void launchRandom(@Nonnull Entity n, int amount) { return COLORS[ThreadLocalRandom.current().nextInt(COLORS.length)]; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/HeadTexture.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/HeadTexture.java index a4caf14774..b1673fb20a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/HeadTexture.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.nio.charset.StandardCharsets; import java.util.UUID; @@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.bakedlibs.dough.skins.PlayerSkin; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; /** * This enum holds all currently used Head textures in Slimefun. @@ -163,8 +163,14 @@ public enum HeadTexture { return SlimefunUtils.getCustomHead(getTexture()); } - public @Nonnull PlayerSkin getAsSkin() { - return PlayerSkin.fromHashCode(texture); + /** + * Returns a base64-encoded texture string for this head texture. + * + * @return The base64 texture string + */ + public @Nonnull String getBase64Texture() { + return VersionedPlayerHead.hashToBase64(texture); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/InfiniteBlockGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/InfiniteBlockGenerator.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/InfiniteBlockGenerator.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/InfiniteBlockGenerator.java index 9c0a80c5b7..dbaa7b318d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/InfiniteBlockGenerator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/InfiniteBlockGenerator.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.function.Predicate; @@ -14,8 +14,8 @@ import org.bukkit.block.BlockState; import org.bukkit.event.block.BlockFormEvent; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.items.androids.MinerAndroid; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.items.androids.MinerAndroid; import io.papermc.lib.PaperLib; /** @@ -170,3 +170,4 @@ private boolean hasSurroundingMaterials(Block b, Material... materials) { return null; } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/JsonUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/JsonUtils.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/JsonUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/JsonUtils.java index 57a7f3eb80..bf86872686 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/JsonUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/JsonUtils.java @@ -1,12 +1,12 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import javax.annotation.Nonnull; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * Some helper methods for dealing with Json data. @@ -47,3 +47,4 @@ private JsonUtils() {} } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/LoreBuilder.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/LoreBuilder.java similarity index 86% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/LoreBuilder.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/LoreBuilder.java index 6a3a67cc9a..a17af4c954 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/LoreBuilder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/LoreBuilder.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -6,11 +6,11 @@ import javax.annotation.Nonnull; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineTier; -import io.github.thebusybiscuit.slimefun4.core.attributes.MachineType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineTier; +import io.github.thebusybiscuit.slimefun5.core.attributes.MachineType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; /** * This utility class provides a few handy methods and constants to build the lore of any @@ -78,3 +78,4 @@ private LoreBuilder() {} } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/NumberUtils.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/NumberUtils.java index 0b85e6e68d..0f11881654 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/NumberUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -15,7 +15,7 @@ import org.bukkit.ChatColor; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class contains various utilities related to numbers and number formatting. @@ -316,3 +316,4 @@ public static int limitedAddition(int a, int b, int min, int max) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/PatternUtils.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/PatternUtils.java index f68c3a6f52..9184223b40 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/PatternUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.regex.Pattern; @@ -30,3 +30,4 @@ private PatternUtils() {} public static final Pattern USES_LEFT_LORE = Pattern.compile(ChatColor.YELLOW + "[0-9]+ Uses? " + ChatColor.GRAY + "left"); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/RadiationUtils.java similarity index 85% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/RadiationUtils.java index a9883b4a5b..2692b4b229 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/RadiationUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import javax.annotation.Nonnull; @@ -7,9 +7,9 @@ import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import io.github.thebusybiscuit.slimefun4.api.player.StatusEffect; -import io.github.thebusybiscuit.slimefun4.core.attributes.RadiationSymptom; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.player.StatusEffect; +import io.github.thebusybiscuit.slimefun5.core.attributes.RadiationSymptom; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This class is a basic wrapper around the @@ -50,3 +50,4 @@ public static void removeExposure(@Nonnull Player p, int exposure) { RADIATION_EFFECT.addPermanent(p, level); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/SlimefunUtils.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/SlimefunUtils.java index ed5bdb9b4d..fdb8ce2daf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/SlimefunUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -29,23 +29,22 @@ import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.bakedlibs.dough.items.ItemMetaSnapshot; -import io.github.bakedlibs.dough.skins.PlayerHead; -import io.github.bakedlibs.dough.skins.PlayerSkin; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunItemSpawnEvent; -import io.github.thebusybiscuit.slimefun4.api.exceptions.PrematureCodeException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSpawnReason; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.DistinctiveItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; -import io.github.thebusybiscuit.slimefun4.core.debug.Debug; -import io.github.thebusybiscuit.slimefun4.core.debug.TestCase; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.implementation.tasks.CapacitorTextureUpdateTask; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedPlayerHead; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunItemSpawnEvent; +import io.github.thebusybiscuit.slimefun5.api.exceptions.PrematureCodeException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSpawnReason; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.DistinctiveItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactive; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.core.debug.Debug; +import io.github.thebusybiscuit.slimefun5.core.debug.TestCase; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.implementation.tasks.CapacitorTextureUpdateTask; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; /** * This utility class holds method that are directly linked to Slimefun. @@ -241,8 +240,7 @@ public static boolean isRadioactive(@Nullable ItemStack item) { base64 = Base64.getEncoder().encodeToString(("{\"textures\":{\"SKIN\":{\"url\":\"http://textures.minecraft.net/texture/" + texture + "\"}}}").getBytes(StandardCharsets.UTF_8)); } - PlayerSkin skin = PlayerSkin.fromBase64(base64); - return PlayerHead.getItemStack(skin); + return VersionedPlayerHead.getItemStack(base64); } public static boolean containsSimilarItem(Inventory inventory, ItemStack item, boolean checkLore) { @@ -692,3 +690,4 @@ public static boolean isInventoryEmpty(@Nonnull Inventory inventory) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/UnbreakingAlgorithm.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/UnbreakingAlgorithm.java index da9ce2c890..2264666399 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/UnbreakingAlgorithm.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.function.IntFunction; @@ -6,7 +6,7 @@ import org.bukkit.enchantments.Enchantment; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; /** * This a enum evaluating and indicating a {@link DamageableItem} 's chance to be damaged @@ -54,3 +54,4 @@ public boolean evaluate(int unbreakingLevel) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeDataConverter.java similarity index 95% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeDataConverter.java index 62abe710f6..39d4b372c6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeDataConverter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import javax.annotation.Nonnull; @@ -44,3 +44,4 @@ public interface BiomeDataConverter { T convert(@Nonnull JsonElement jsonElement); } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMap.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMap.java similarity index 97% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMap.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMap.java index 6f652a017e..ca7629f690 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMap.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMap.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import java.io.BufferedReader; import java.io.IOException; @@ -19,8 +19,8 @@ import com.google.gson.JsonElement; -import io.github.thebusybiscuit.slimefun4.api.exceptions.BiomeMapException; -import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; +import io.github.thebusybiscuit.slimefun5.api.exceptions.BiomeMapException; +import io.github.thebusybiscuit.slimefun5.api.geo.GEOResource; import org.bukkit.plugin.java.JavaPlugin; /** @@ -188,3 +188,4 @@ public static BiomeMap fromResource(NamespacedKey key, JavaPlugin plugin, return fromResource(key, plugin, path, JsonElement::getAsString); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMapParser.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMapParser.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMapParser.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMapParser.java index d1e3483938..5a64a00501 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMapParser.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/BiomeMapParser.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import java.util.HashMap; @@ -20,9 +20,9 @@ import com.google.gson.JsonParseException; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.exceptions.BiomeMapException; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import io.github.thebusybiscuit.slimefun5.api.exceptions.BiomeMapException; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.utils.PatternUtils; /** * The {@link BiomeMapParser} allows you to parse json data into a {@link BiomeMap}. @@ -208,3 +208,4 @@ public BiomeMap buildBiomeMap() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/package-info.java new file mode 100644 index 0000000000..9fa98df9bf --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/biomes/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains classes centered around our {@link io.github.thebusybiscuit.slimefun5.utils.biomes.BiomeMap} + * utility. + */ +package io.github.thebusybiscuit.slimefun5.utils.biomes; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedAttribute.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedAttribute.java new file mode 100644 index 0000000000..530c331245 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedAttribute.java @@ -0,0 +1,26 @@ +package io.github.thebusybiscuit.slimefun5.utils.compatibility; + +import org.bukkit.NamespacedKey; +import org.bukkit.Registry; +import org.bukkit.attribute.Attribute; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +// https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java?until=2a6207fe150b6165722fce94c83cc1f206620ab5&untilPath=src%2Fmain%2Fjava%2Forg%2Fbukkit%2Fcraftbukkit%2Flegacy%2FFieldRename.java#112-157 +public class VersionedAttribute { + + public static final Attribute MAX_HEALTH; + + static { + // Attribute.GENERIC_MAX_HEALTH was renamed to Attribute.MAX_HEALTH in Minecraft 1.21.2+. + // Registry key is "generic.max_health" across all versions + MAX_HEALTH = getKey("generic.max_health"); + } + + @Nullable + private static Attribute getKey(@Nonnull String key) { + return Registry.ATTRIBUTE.get(NamespacedKey.minecraft(key)); + } +} + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEnchantment.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEnchantment.java index d5063ce413..a22209f7e0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEnchantment.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; +package io.github.thebusybiscuit.slimefun5.utils.compatibility; import org.bukkit.NamespacedKey; import org.bukkit.Registry; @@ -46,3 +46,4 @@ private static Enchantment getKey(@Nonnull String key) { return Registry.ENCHANTMENT.get(NamespacedKey.minecraft(key)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEntityType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEntityType.java similarity index 94% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEntityType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEntityType.java index 10ae11e803..65148cdd1a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEntityType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedEntityType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; +package io.github.thebusybiscuit.slimefun5.utils.compatibility; import org.bukkit.NamespacedKey; import org.bukkit.Registry; @@ -29,3 +29,4 @@ private static EntityType getKey(@Nonnull String key) { return Registry.ENTITY_TYPE.get(NamespacedKey.minecraft(key)); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedItemFlag.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedItemFlag.java new file mode 100644 index 0000000000..9ffc21cd4f --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedItemFlag.java @@ -0,0 +1,57 @@ +package io.github.thebusybiscuit.slimefun5.utils.compatibility; + +import java.lang.reflect.Field; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import org.bukkit.inventory.ItemFlag; +import org.bukkit.inventory.meta.ItemMeta; + +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; + +public class VersionedItemFlag { + + public static final @Nullable ItemFlag HIDE_ADDITIONAL_TOOLTIP; + + // HIDE_ATTRIBUTES and HIDE_ENCHANTS were removed in 1.21.5+ in favor of + // the tooltip_display component. We resolve them via reflection so the + // plugin does not crash on newer versions where these constants no longer exist. + public static final @Nullable ItemFlag HIDE_ATTRIBUTES; + public static final @Nullable ItemFlag HIDE_ENCHANTS; + + static { + MinecraftVersion version = Slimefun.getMinecraftVersion(); + + if (version != null && version.isAtLeast(MinecraftVersion.MINECRAFT_1_20_5)) { + ItemFlag flag = getKey("HIDE_ADDITIONAL_TOOLTIP"); + HIDE_ADDITIONAL_TOOLTIP = flag != null ? flag : getKey("HIDE_POTION_EFFECTS"); + } else { + HIDE_ADDITIONAL_TOOLTIP = getKey("HIDE_POTION_EFFECTS"); + } + + HIDE_ATTRIBUTES = getKey("HIDE_ATTRIBUTES"); + HIDE_ENCHANTS = getKey("HIDE_ENCHANTS"); + } + + // Safely adds ItemFlags to ItemMeta, skipping null flags that don't exist in the current Minecraft version + public static void addFlags(@Nonnull ItemMeta meta, @Nullable ItemFlag... flags) { + for (ItemFlag flag : flags) { + if (flag != null) { + meta.addItemFlags(flag); + } + } + } + + @Nullable + private static ItemFlag getKey(@Nonnull String key) { + try { + Field field = ItemFlag.class.getDeclaredField(key); + return (ItemFlag) field.get(null); + } catch(Exception e) { + return null; + } + } +} + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedParticle.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedParticle.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedParticle.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedParticle.java index fafd340cc0..71b7db51da 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedParticle.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedParticle.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; +package io.github.thebusybiscuit.slimefun5.utils.compatibility; import java.lang.reflect.Field; @@ -7,8 +7,8 @@ import org.bukkit.Particle; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; // https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java?until=2a6207fe150b6165722fce94c83cc1f206620ab5&untilPath=src%2Fmain%2Fjava%2Forg%2Fbukkit%2Fcraftbukkit%2Flegacy%2FFieldRename.java#281-318 public class VersionedParticle { @@ -76,3 +76,4 @@ private static Particle getKey(@Nonnull String key) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPlayerHead.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPlayerHead.java new file mode 100644 index 0000000000..4c2940ab55 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPlayerHead.java @@ -0,0 +1,192 @@ +package io.github.thebusybiscuit.slimefun5.utils.compatibility; + +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Base64; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.Skull; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.SkullMeta; +import org.bukkit.profile.PlayerProfile; +import org.bukkit.profile.PlayerTextures; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public final class VersionedPlayerHead { + + private static final String PROFILE_NAME = "CS-CoreLib"; + + private VersionedPlayerHead() {} + + public static @Nonnull ItemStack getItemStack(@Nonnull String base64) { + ItemStack item = new ItemStack(Material.PLAYER_HEAD); + SkullMeta meta = (SkullMeta) item.getItemMeta(); + + applyTextureToMeta(meta, base64); + + item.setItemMeta(meta); + return item; + } + + public static void applyTextureToMeta(@Nonnull SkullMeta meta, @Nonnull String base64) { + UUID uuid = UUID.nameUUIDFromBytes(base64.getBytes(StandardCharsets.UTF_8)); + URL skinUrl = extractSkinUrl(base64); + + if (skinUrl != null) { + PlayerProfile profile = Bukkit.createPlayerProfile(uuid, PROFILE_NAME); + PlayerTextures textures = profile.getTextures(); + textures.setSkin(skinUrl); + profile.setTextures(textures); + meta.setOwnerProfile(profile); + } + } + + public static void setSkin(@Nonnull Block block, @Nonnull String base64, boolean sendBlockUpdate) { + Material material = block.getType(); + if (material != Material.PLAYER_HEAD && material != Material.PLAYER_WALL_HEAD) { + return; + } + + UUID uuid = UUID.nameUUIDFromBytes(base64.getBytes(StandardCharsets.UTF_8)); + URL skinUrl = extractSkinUrl(base64); + + if (skinUrl != null) { + Skull skull = (Skull) block.getState(); + PlayerProfile profile = Bukkit.createPlayerProfile(uuid, PROFILE_NAME); + PlayerTextures textures = profile.getTextures(); + textures.setSkin(skinUrl); + profile.setTextures(textures); + skull.setOwnerProfile(profile); + skull.update(sendBlockUpdate, false); + } + } + + public static void setSkinFromHash(@Nonnull Block block, @Nonnull UUID uuid, @Nonnull String hashCode, boolean sendBlockUpdate) { + Material material = block.getType(); + if (material != Material.PLAYER_HEAD && material != Material.PLAYER_WALL_HEAD) { + return; + } + + URL skinUrl = getTextureUrl(hashCode); + + if (skinUrl != null) { + Skull skull = (Skull) block.getState(); + PlayerProfile profile = Bukkit.createPlayerProfile(uuid, PROFILE_NAME); + PlayerTextures textures = profile.getTextures(); + textures.setSkin(skinUrl); + profile.setTextures(textures); + skull.setOwnerProfile(profile); + skull.update(sendBlockUpdate, false); + } + } + + public static @Nonnull String hashToBase64(@Nonnull String hashCode) { + String value = "{\"textures\":{\"SKIN\":{\"url\":\"http://textures.minecraft.net/texture/" + hashCode + "\"}}}"; + return Base64.getEncoder().encodeToString(value.getBytes(StandardCharsets.UTF_8)); + } + + public static @Nonnull CompletableFuture fetchSkinTexture(@Nonnull UUID playerUuid) { + return CompletableFuture.supplyAsync(() -> { + try { + String targetUrl = "https://sessionserver.mojang.com/session/minecraft/profile/" + + playerUuid.toString().replace("-", "") + "?unsigned=false"; + + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(targetUrl)) + .timeout(Duration.ofSeconds(30)) + .GET() + .build(); + + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + JsonObject obj = JsonParser.parseString(response.body()).getAsJsonObject(); + + if (obj.has("error")) { + throw new RuntimeException(obj.get("error").getAsString()); + } + + for (JsonElement el : obj.get("properties").getAsJsonArray()) { + if (el.isJsonObject() && el.getAsJsonObject().get("name").getAsString().equals("textures")) { + return el.getAsJsonObject().get("value").getAsString(); + } + } + + return null; + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + + public static @Nonnull CompletableFuture lookupUUID(@Nonnull String username) { + return CompletableFuture.supplyAsync(() -> { + try { + String targetUrl = "https://playerdb.co/api/player/minecraft/" + username; + + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(targetUrl)) + .timeout(Duration.ofSeconds(30)) + .header("user-agent", "Mozilla/5.0 Dough (+https://github.com/baked-libs/dough)") + .GET() + .build(); + + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + JsonObject jsonObject = JsonParser.parseString(response.body()).getAsJsonObject(); + + if (jsonObject.get("success").getAsBoolean()) { + JsonObject data = jsonObject.getAsJsonObject("data"); + JsonObject player = data.getAsJsonObject("player"); + return UUID.fromString(player.get("id").getAsString()); + } + + return null; + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + + @Nullable + private static URL getTextureUrl(@Nonnull String hashCode) { + try { + return URI.create("http://textures.minecraft.net/texture/" + hashCode).toURL(); + } catch (MalformedURLException e) { + return null; + } + } + + @Nullable + private static URL extractSkinUrl(@Nonnull String base64) { + try { + String decoded = new String(Base64.getDecoder().decode(base64), StandardCharsets.UTF_8); + JsonObject json = JsonParser.parseString(decoded).getAsJsonObject(); + String url = json.getAsJsonObject("textures").getAsJsonObject("SKIN").get("url").getAsString(); + return URI.create(url).toURL(); + } catch (Exception e) { + return null; + } + } +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionEffectType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionEffectType.java similarity index 93% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionEffectType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionEffectType.java index f3dbe6b6d1..609d38d96a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionEffectType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionEffectType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; +package io.github.thebusybiscuit.slimefun5.utils.compatibility; import java.lang.reflect.Field; @@ -7,8 +7,8 @@ import org.bukkit.potion.PotionEffectType; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; // https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java?until=2a6207fe150b6165722fce94c83cc1f206620ab5&untilPath=src%2Fmain%2Fjava%2Forg%2Fbukkit%2Fcraftbukkit%2Flegacy%2FFieldRename.java#216-228 public class VersionedPotionEffectType { @@ -73,3 +73,4 @@ private static PotionEffectType getKey(@Nonnull String key) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionType.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionType.java similarity index 90% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionType.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionType.java index 1713d77baf..d4901279e5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedPotionType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/compatibility/VersionedPotionType.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.compatibility; +package io.github.thebusybiscuit.slimefun5.utils.compatibility; import java.lang.reflect.Field; @@ -7,8 +7,8 @@ import org.bukkit.potion.PotionType; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; // https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java?until=2a6207fe150b6165722fce94c83cc1f206620ab5&untilPath=src%2Fmain%2Fjava%2Forg%2Fbukkit%2Fcraftbukkit%2Flegacy%2FFieldRename.java#242-250 public class VersionedPotionType { @@ -53,3 +53,4 @@ private static PotionType getKey(@Nonnull String key) { } } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ColoredFireworkStar.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ColoredFireworkStar.java similarity index 80% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ColoredFireworkStar.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ColoredFireworkStar.java index 36ccef1cb8..33d311788c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ColoredFireworkStar.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ColoredFireworkStar.java @@ -1,7 +1,7 @@ -package io.github.thebusybiscuit.slimefun4.utils.itemstack; +package io.github.thebusybiscuit.slimefun5.utils.itemstack; import io.github.bakedlibs.dough.items.ItemStackEditor; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedItemFlag; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedItemFlag; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; @@ -26,9 +26,10 @@ public static ItemStack create(Color color, String name, String... lore) { return new ItemStackEditor(Material.FIREWORK_STAR) .setDisplayName(name) .setLore(lore) - .addFlags(VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP) + .andMetaConsumer(meta -> VersionedItemFlag.addFlags(meta, VersionedItemFlag.HIDE_ADDITIONAL_TOOLTIP)) .andMetaConsumer(FireworkEffectMeta.class, meta -> meta.setEffect(effect)) .create(); } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ItemStackWrapper.java similarity index 98% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ItemStackWrapper.java index 9091db07b8..b3063869d9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/ItemStackWrapper.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.itemstack; +package io.github.thebusybiscuit.slimefun5.utils.itemstack; import java.util.ArrayList; import java.util.List; @@ -185,3 +185,4 @@ public void addUnsafeEnchantment(Enchantment ench, int level) { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/SlimefunGuideItem.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/SlimefunGuideItem.java similarity index 82% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/SlimefunGuideItem.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/SlimefunGuideItem.java index 2acc1df0e0..bcde94f0fc 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/SlimefunGuideItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/SlimefunGuideItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.itemstack; +package io.github.thebusybiscuit.slimefun5.utils.itemstack; import java.util.ArrayList; import java.util.List; @@ -11,10 +11,10 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideImplementation; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideImplementation; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; /** * This is just a helper {@link ItemStack} class for the {@link SlimefunGuide} {@link ItemStack}. @@ -48,3 +48,4 @@ public SlimefunGuideItem(@Nonnull SlimefunGuideImplementation implementation, @N } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/package-info.java similarity index 71% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/package-info.java index 5eda112b56..b2734ccdba 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/itemstack/package-info.java @@ -2,4 +2,4 @@ * This package contains some utility classes that revolve around the creation or handling of an * {@link org.bukkit.inventory.ItemStack}. */ -package io.github.thebusybiscuit.slimefun4.utils.itemstack; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.utils.itemstack; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/package-info.java similarity index 73% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/package-info.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/package-info.java index 2aee49f530..a899569f99 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/package-info.java @@ -2,4 +2,4 @@ * This package contains some utility classes that offer handy ways to do stuff. * They are often not directly related to Slimefun. */ -package io.github.thebusybiscuit.slimefun4.utils; \ No newline at end of file +package io.github.thebusybiscuit.slimefun5.utils; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/SlimefunTag.java similarity index 92% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/SlimefunTag.java index 7eab9b680f..7dd8d4b70d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/SlimefunTag.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.tags; +package io.github.thebusybiscuit.slimefun5.utils.tags; import java.util.Collections; import java.util.HashMap; @@ -11,25 +11,25 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.AbstractAutoCrafter; +import io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters.AbstractAutoCrafter; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.Tag; import org.bukkit.block.data.Waterlogged; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer; -import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.EnhancedFurnace; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman; -import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.IndustrialMiner; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ClimbingPick; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosiveShovel; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfTheSeeker; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfVeinMining; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.SmeltersPickaxe; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.BlockPlacer; +import io.github.thebusybiscuit.slimefun5.implementation.items.blocks.EnhancedFurnace; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.accelerators.CropGrowthAccelerator; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman; +import io.github.thebusybiscuit.slimefun5.implementation.items.multiblocks.miner.IndustrialMiner; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ClimbingPick; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.ExplosiveShovel; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfTheSeeker; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.PickaxeOfVeinMining; +import io.github.thebusybiscuit.slimefun5.implementation.items.tools.SmeltersPickaxe; /** * This enum contains various implementations of the {@link Tag} interface. @@ -439,3 +439,4 @@ public boolean isEmpty() { } } + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/TagParser.java b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/TagParser.java similarity index 96% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/TagParser.java rename to src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/TagParser.java index 7667e9ceed..1dd076d1e4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/TagParser.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun5/utils/tags/TagParser.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.tags; +package io.github.thebusybiscuit.slimefun5.utils.tags; import java.io.BufferedReader; import java.io.IOException; @@ -27,10 +27,10 @@ import com.google.gson.JsonPrimitive; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; -import io.github.thebusybiscuit.slimefun4.utils.PatternUtils; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.utils.PatternUtils; /** * The {@link TagParser} is responsible for parsing a JSON input into a {@link SlimefunTag}. @@ -200,3 +200,4 @@ private void parseComplexValue(JsonObject entry, Set materials, Set { @@ -71,3 +71,4 @@ public boolean test(ItemStack item) { } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/interfaces/InventoryBlock.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/interfaces/InventoryBlock.java index 9c368d67ad..d520d71875 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/interfaces/InventoryBlock.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/interfaces/InventoryBlock.java @@ -8,8 +8,8 @@ import org.bukkit.inventory.Inventory; import io.github.bakedlibs.dough.protection.Interaction; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; @@ -75,3 +75,4 @@ public boolean canOpen(Block b, Player p) { } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/BlockTicker.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/BlockTicker.java index 23d3bd2b8d..d5259daa39 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/BlockTicker.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/handlers/BlockTicker.java @@ -4,10 +4,10 @@ import org.bukkit.block.Block; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.attributes.NotPlaceable; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; @@ -75,3 +75,4 @@ public void startNewTick() { } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 78c9cc90a7..581f6740ad 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -37,9 +37,9 @@ import io.github.bakedlibs.dough.blocks.BlockPosition; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.NumberUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -944,3 +944,4 @@ public boolean hasUniversalInventory(Location l) { return id != null && hasUniversalInventory(id); } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java index f270ba6ee1..7f430edbf8 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java @@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; // This class will be deprecated, relocated and rewritten in a future version. public class BlockMenu extends DirtyChestMenu { @@ -123,3 +123,4 @@ public void delete(Location l) { } } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java index 1ef479341f..e397b37447 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java @@ -14,9 +14,9 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; @@ -299,3 +299,4 @@ public static boolean isUniversalInventory(String id) { } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java index dd2bf8cd12..c9efbe2b49 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java @@ -15,7 +15,7 @@ import io.github.bakedlibs.dough.inventory.InvUtils; import io.github.bakedlibs.dough.items.CustomItemStack; import io.github.bakedlibs.dough.items.ItemUtils; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -171,3 +171,4 @@ public void replaceExistingItem(int slot, ItemStack item, boolean event) { } } + diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/ItemTransportFlow.java b/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/ItemTransportFlow.java index 44d30158f4..efb893350c 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/ItemTransportFlow.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/ItemTransportFlow.java @@ -3,7 +3,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -33,3 +33,4 @@ public enum ItemTransportFlow { WITHDRAW; } + diff --git a/src/main/resources/biome-maps/oil_v1.16.json b/src/main/resources/biome-maps/oil_v1.16.json index d0d5636e4e..34bacf9db9 100644 --- a/src/main/resources/biome-maps/oil_v1.16.json +++ b/src/main/resources/biome-maps/oil_v1.16.json @@ -15,9 +15,7 @@ { "value" : 20, "biomes" : [ - "minecraft:swamp", - "minecraft:swamp_hills" - ] + "minecraft:swamp"] }, { "value" : 24, @@ -42,7 +40,6 @@ "value" : 45, "biomes" : [ "minecraft:desert", - "minecraft:desert_hills", "minecraft:desert_lakes" ] }, diff --git a/src/main/resources/biome-maps/salt_v1.16.json b/src/main/resources/biome-maps/salt_v1.16.json index 1fd00fde09..6066e7d1aa 100644 --- a/src/main/resources/biome-maps/salt_v1.16.json +++ b/src/main/resources/biome-maps/salt_v1.16.json @@ -2,9 +2,7 @@ { "value" : 20, "biomes" : [ - "minecraft:swamp", - "minecraft:swamp_hills" - ] + "minecraft:swamp"] }, { "value" : 40, diff --git a/src/main/resources/biome-maps/uranium_v1.16.json b/src/main/resources/biome-maps/uranium_v1.16.json index 425266cefb..544e5110f4 100644 --- a/src/main/resources/biome-maps/uranium_v1.16.json +++ b/src/main/resources/biome-maps/uranium_v1.16.json @@ -12,15 +12,9 @@ "biomes" : [ "minecraft:mountains", "minecraft:wooded_mountains", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", "minecraft:mountain_edge", - "minecraft:jungle_hills", "minecraft:gravelly_mountains", "minecraft:taiga_mountains", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga_hills", "minecraft:modified_gravelly_mountains", diff --git a/src/main/resources/biome-maps/uranium_v1.17.json b/src/main/resources/biome-maps/uranium_v1.17.json index 7c8e1f8ba1..fb84b08ebb 100644 --- a/src/main/resources/biome-maps/uranium_v1.17.json +++ b/src/main/resources/biome-maps/uranium_v1.17.json @@ -12,15 +12,9 @@ "biomes" : [ "minecraft:mountains", "minecraft:wooded_mountains", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", "minecraft:mountain_edge", - "minecraft:jungle_hills", "minecraft:gravelly_mountains", "minecraft:taiga_mountains", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga_hills", "minecraft:modified_gravelly_mountains", diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 5e36b700b7..dd74a93d48 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -2,7 +2,7 @@ options: # Instead of disabling Auto Updates consider using the "stable" version of Slimefun. # These builds are much more tested and are far less likely to have any issues. # Note: When running a stable build auto-updates ONLY update to other stable builds! Perfect eh? - # You can download the latest stable build here: https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/ + # You can download the latest stable build here: https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun5/stable/ auto-update: true chat-prefix: '&a&lSlimefun 4&7> ' diff --git a/src/main/resources/languages/bg/messages.yml b/src/main/resources/languages/bg/messages.yml index b4553da96d..da09cea6d3 100644 --- a/src/main/resources/languages/bg/messages.yml +++ b/src/main/resources/languages/bg/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun Ръководство' settings: 'Настройки & Информация' languages: 'Изберете вашия предпочитан език' - credits: 'Slimefun4 Контрибутори' - wiki: 'Slimefun4 Уики' - addons: 'Добавки за Slimefun4' + credits: 'Slimefun5 Контрибутори' + wiki: 'Slimefun5 Уики' + addons: 'Добавки за Slimefun5' bugs: 'Бъг Доклади' source: 'Програмен Код' versions: 'Инсталирани версии' diff --git a/src/main/resources/languages/cs/messages.yml b/src/main/resources/languages/cs/messages.yml index cf75d51422..8da1672c0f 100644 --- a/src/main/resources/languages/cs/messages.yml +++ b/src/main/resources/languages/cs/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun příručka' settings: 'Nastavení a informace' languages: 'Zvol svůj preferovaný jazyk' - credits: 'Slimefun4 pomocníci' - wiki: 'Slimefun4 Wiki' - addons: 'Doplňky pro Slimefun4' + credits: 'Slimefun5 pomocníci' + wiki: 'Slimefun5 Wiki' + addons: 'Doplňky pro Slimefun5' bugs: 'Nahlášení chyb' source: 'Zdrojový kód' versions: 'Nainstalovaná verze' diff --git a/src/main/resources/languages/de/messages.yml b/src/main/resources/languages/de/messages.yml index 5debea0c8e..a9b71397cd 100644 --- a/src/main/resources/languages/de/messages.yml +++ b/src/main/resources/languages/de/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun-Handbuch' settings: 'Einstellungen & Infos' languages: 'Wähle deine bevorzugte Sprache' - credits: 'Slimefun4: Mitwirkende' - wiki: 'Slimefun4-Wiki' - addons: 'Addons für Slimefun4' + credits: 'Slimefun5: Mitwirkende' + wiki: 'Slimefun5-Wiki' + addons: 'Addons für Slimefun5' bugs: 'Fehlermeldungen' source: 'Quellcode' versions: 'Installierte Versionen' diff --git a/src/main/resources/languages/en/messages.yml b/src/main/resources/languages/en/messages.yml index 77bd80895a..ade85c6c42 100644 --- a/src/main/resources/languages/en/messages.yml +++ b/src/main/resources/languages/en/messages.yml @@ -142,9 +142,9 @@ guide: main: 'Slimefun Guide' settings: 'Settings & Info' languages: 'Select your preferred language' - credits: 'Slimefun4 Contributors' - wiki: 'Slimefun4 Wiki' - addons: 'Addons for Slimefun4' + credits: 'Slimefun5 Contributors' + wiki: 'Slimefun5 Wiki' + addons: 'Addons for Slimefun5' bugs: 'Bug Reports' source: 'Source Code' versions: 'Installed versions' diff --git a/src/main/resources/languages/es/messages.yml b/src/main/resources/languages/es/messages.yml index a512c91313..8f52343ea2 100644 --- a/src/main/resources/languages/es/messages.yml +++ b/src/main/resources/languages/es/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Guía de Slimefun.' settings: 'Configuración e Información.' languages: 'Selecciona tu idioma.' - credits: 'Colaboradores de Slimefun4' - wiki: 'Wiki de Slimefun4' - addons: 'Complementos para Slimefun4' + credits: 'Colaboradores de Slimefun5' + wiki: 'Wiki de Slimefun5' + addons: 'Complementos para Slimefun5' bugs: 'Reportes de Bugs' source: 'Código base' versions: 'Versiones instaladas' diff --git a/src/main/resources/languages/fa/messages.yml b/src/main/resources/languages/fa/messages.yml index eadfe05e13..1e253db8d9 100644 --- a/src/main/resources/languages/fa/messages.yml +++ b/src/main/resources/languages/fa/messages.yml @@ -58,9 +58,9 @@ guide: title: main: 'راهنمای Slimefun' settings: 'تنظیمات و اطلاعات' - credits: 'مشارکت کنندگان Slimefun4' - wiki: 'ویکی Slimefun4' - addons: 'افزون ها برای Slimefun4' + credits: 'مشارکت کنندگان Slimefun5' + wiki: 'ویکی Slimefun5' + addons: 'افزون ها برای Slimefun5' bugs: 'گزارش اشکال ها' source: 'کد منبع' versions: 'نسخه های نصب شده' diff --git a/src/main/resources/languages/fr/messages.yml b/src/main/resources/languages/fr/messages.yml index a3ef433730..3ac54eb561 100644 --- a/src/main/resources/languages/fr/messages.yml +++ b/src/main/resources/languages/fr/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Guide Slimefun' settings: 'Paramètres et informations' languages: 'Choisissez votre langue' - credits: 'Contributeurs de Slimefun4' - wiki: 'Wiki Slimefun4' - addons: 'Extensions de Slimefun4' + credits: 'Contributeurs de Slimefun5' + wiki: 'Wiki Slimefun5' + addons: 'Extensions de Slimefun5' bugs: 'Signaler un bug' source: 'Code Source' versions: 'Versions installées' diff --git a/src/main/resources/languages/hu/messages.yml b/src/main/resources/languages/hu/messages.yml index 9f135acb48..b040e91b34 100644 --- a/src/main/resources/languages/hu/messages.yml +++ b/src/main/resources/languages/hu/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun Útmutató' settings: 'Beállítások és Információk' languages: 'Válaszd ki a kívánt nyelvet' - credits: 'Slimefun4 közreműködők' - wiki: 'Slimefun4 Wiki' - addons: 'A Slimefun4 kiegészítői' + credits: 'Slimefun5 közreműködők' + wiki: 'Slimefun5 Wiki' + addons: 'A Slimefun5 kiegészítői' bugs: 'Hibajelentések' source: 'Forráskód' versions: 'Telepített verziók' diff --git a/src/main/resources/languages/id/messages.yml b/src/main/resources/languages/id/messages.yml index d19eb84def..c24901f273 100644 --- a/src/main/resources/languages/id/messages.yml +++ b/src/main/resources/languages/id/messages.yml @@ -84,9 +84,9 @@ guide: main: 'Panduan Slimefun' settings: 'Pengaturan & Informasi' languages: 'Pilih Bahasa Yang Anda Inginkan' - credits: 'Para Kontributor Slimefun4' - wiki: 'Slimefun4 Wiki' - addons: 'Addons untuk Slimefun4' + credits: 'Para Kontributor Slimefun5' + wiki: 'Slimefun5 Wiki' + addons: 'Addons untuk Slimefun5' bugs: 'Laporkan masalah' source: 'Kode sumber' versions: 'Versi Terinstal' diff --git a/src/main/resources/languages/it/messages.yml b/src/main/resources/languages/it/messages.yml index f01aee0f4c..5ce8eb18f2 100644 --- a/src/main/resources/languages/it/messages.yml +++ b/src/main/resources/languages/it/messages.yml @@ -94,8 +94,8 @@ guide: main: 'Guida della Slimefun' settings: 'Impostazioni e informazioni' languages: 'Seleziona la tua lingua preferita' - credits: 'Collaboratori di Slimefun4' - addons: 'Addons per Slimefun4' + credits: 'Collaboratori di Slimefun5' + addons: 'Addons per Slimefun5' source: 'Codice Sorgente' credits: commit: 'Contributo' diff --git a/src/main/resources/languages/ja/messages.yml b/src/main/resources/languages/ja/messages.yml index 43a343ae1f..0574dc025f 100644 --- a/src/main/resources/languages/ja/messages.yml +++ b/src/main/resources/languages/ja/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefunガイド' settings: '設定・情報' languages: '言語の選択' - credits: 'Slimefun4 開発者' + credits: 'Slimefun5 開発者' wiki: 'スライムファン４のウィキ' - addons: 'Slimefun4 アドオン' + addons: 'Slimefun5 アドオン' bugs: 'バグ報告' source: 'ソースコード' versions: 'バージョン一覧' diff --git a/src/main/resources/languages/ko/messages.yml b/src/main/resources/languages/ko/messages.yml index 85d87150ff..fcfda4733c 100644 --- a/src/main/resources/languages/ko/messages.yml +++ b/src/main/resources/languages/ko/messages.yml @@ -68,8 +68,8 @@ guide: settings: '설정 & 정보' languages: '당신이 원하는 언어를 선택하십시오.' credits: '슬라임펀4 기부자들입니다.' - wiki: 'Slimefun4 위키' - addons: 'Slimefun4의 애드온' + wiki: 'Slimefun5 위키' + addons: 'Slimefun5의 애드온' bugs: '버그 리포트' source: '소스 코드' credits: diff --git a/src/main/resources/languages/lv/messages.yml b/src/main/resources/languages/lv/messages.yml index 93097df43d..9e71f54c9f 100644 --- a/src/main/resources/languages/lv/messages.yml +++ b/src/main/resources/languages/lv/messages.yml @@ -33,7 +33,7 @@ guide: main: 'Slimefun grāmata' settings: 'Iestatījumi un informācija' languages: 'Izvēlies savu vēlamo valodu,' - credits: 'Slimefun4 Ieguldītāji' + credits: 'Slimefun5 Ieguldītāji' credits: commit: 'Ieguldījums' commits: 'Ieguldījumi' diff --git a/src/main/resources/languages/nl/messages.yml b/src/main/resources/languages/nl/messages.yml index 049d06f7ee..f1b19bcb2e 100644 --- a/src/main/resources/languages/nl/messages.yml +++ b/src/main/resources/languages/nl/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun Handboek' settings: 'Instellingen & Informatie' languages: 'Kies een taal bij voorkeur' - credits: 'Slimefun4 Bijdragers' - wiki: 'Slimefun4 Wiki' - addons: 'Uitbreidingen voor Slimefun4' + credits: 'Slimefun5 Bijdragers' + wiki: 'Slimefun5 Wiki' + addons: 'Uitbreidingen voor Slimefun5' bugs: 'Fouten rapporteren' source: 'Bron Code' versions: 'Geïnstalleerde versies' diff --git a/src/main/resources/languages/pl/messages.yml b/src/main/resources/languages/pl/messages.yml index bae152e144..11b0c28250 100644 --- a/src/main/resources/languages/pl/messages.yml +++ b/src/main/resources/languages/pl/messages.yml @@ -68,9 +68,9 @@ guide: main: 'Przewodnik Slimefun' settings: 'Ustawienia i informacje' languages: 'Wybierz preferowany język' - credits: 'Autorzy Slimefun4' - wiki: 'Wiki Slimefun4' - addons: 'Dodatki dla Slimefun4' + credits: 'Autorzy Slimefun5' + wiki: 'Wiki Slimefun5' + addons: 'Dodatki dla Slimefun5' bugs: 'Zgłaszanie błędów' source: 'Kod Źródłowy' versions: 'Zainstalowane wersje' diff --git a/src/main/resources/languages/pt-BR/messages.yml b/src/main/resources/languages/pt-BR/messages.yml index 9b63333863..9084d09cd4 100644 --- a/src/main/resources/languages/pt-BR/messages.yml +++ b/src/main/resources/languages/pt-BR/messages.yml @@ -80,9 +80,9 @@ guide: main: 'Guia do Slimefun' settings: 'Config & Info' languages: 'Selecione seu idioma preferido' - credits: 'Contribuidores do Slimefun4' - wiki: 'Wiki do Slimefun4' - addons: 'Add-ons do Slimefun4' + credits: 'Contribuidores do Slimefun5' + wiki: 'Wiki do Slimefun5' + addons: 'Add-ons do Slimefun5' bugs: 'Relatório de Erros' source: 'Código Fonte' versions: 'Versões instaladas' diff --git a/src/main/resources/languages/pt/messages.yml b/src/main/resources/languages/pt/messages.yml index 23ddfacb86..2a0964ea0c 100644 --- a/src/main/resources/languages/pt/messages.yml +++ b/src/main/resources/languages/pt/messages.yml @@ -96,9 +96,9 @@ guide: main: 'Guia Slimefun' settings: 'Configurações e informação' languages: 'Selecione a sua linguagem' - credits: 'Contribuidores de Slimefun4' - wiki: 'Wiki de Slimefun4' - addons: 'Addons para Slimefun4' + credits: 'Contribuidores de Slimefun5' + wiki: 'Wiki de Slimefun5' + addons: 'Addons para Slimefun5' bugs: 'Bugs' source: 'Código fonte' versions: 'Versões instaladas' diff --git a/src/main/resources/languages/ro/messages.yml b/src/main/resources/languages/ro/messages.yml index 2990fecf43..451dcc38f3 100644 --- a/src/main/resources/languages/ro/messages.yml +++ b/src/main/resources/languages/ro/messages.yml @@ -31,9 +31,9 @@ guide: main: 'Ghid Slimefun' settings: 'Setări și informații' languages: 'Selectați limba preferată' - credits: 'Contribuitori Slimefun4' - wiki: 'Wiki Slimefun4' - addons: 'Addons pentru Slimefun4' + credits: 'Contribuitori Slimefun5' + wiki: 'Wiki Slimefun5' + addons: 'Addons pentru Slimefun5' bugs: 'Raportare Buguri' source: 'Cod sursă' versions: 'Versiuni instalate' diff --git a/src/main/resources/languages/ru/messages.yml b/src/main/resources/languages/ru/messages.yml index 61b0dbfb5b..3cff4ca14a 100644 --- a/src/main/resources/languages/ru/messages.yml +++ b/src/main/resources/languages/ru/messages.yml @@ -83,9 +83,9 @@ guide: main: 'Руководство Slimefun' settings: 'Информация и настройки' languages: 'Выберите Ваш предпочитаемый язык' - credits: 'Авторы Slimefun4' - wiki: 'Slimefun4 Вики' - addons: 'Дополнения к Slimefun4' + credits: 'Авторы Slimefun5' + wiki: 'Slimefun5 Вики' + addons: 'Дополнения к Slimefun5' bugs: 'Отчёты об ошибках' source: 'Исходный код' versions: 'Установленные версии' diff --git a/src/main/resources/languages/sk/messages.yml b/src/main/resources/languages/sk/messages.yml index 17e1f58236..bd06d5f18c 100644 --- a/src/main/resources/languages/sk/messages.yml +++ b/src/main/resources/languages/sk/messages.yml @@ -59,8 +59,8 @@ guide: main: 'Slimefun príručka' settings: 'Nastavenia a informácie' languages: 'Nastav si preferovaný jazyk' - credits: 'Slimefun4 prispievatelia' - addons: 'Doplnky pre Slimefun4' + credits: 'Slimefun5 prispievatelia' + addons: 'Doplnky pre Slimefun5' bugs: 'Report bugov' source: 'Zdrojový kód' versions: 'Nainštalované verzie' diff --git a/src/main/resources/languages/sv/messages.yml b/src/main/resources/languages/sv/messages.yml index aa141bee30..bab9c19db4 100644 --- a/src/main/resources/languages/sv/messages.yml +++ b/src/main/resources/languages/sv/messages.yml @@ -62,9 +62,9 @@ guide: main: 'Slimefun-handbok' settings: 'Inställningar & Info' languages: 'Välj ditt föredragna språk' - credits: 'Slimefun4-medhjälpare' - wiki: 'Slimefun4 Wiki' - addons: 'Tilläg till Slimefun4' + credits: 'Slimefun5-medhjälpare' + wiki: 'Slimefun5 Wiki' + addons: 'Tilläg till Slimefun5' bugs: 'Bugg Rapporter' source: 'Källkoden' versions: 'Installerade versioner' diff --git a/src/main/resources/languages/th/messages.yml b/src/main/resources/languages/th/messages.yml index b2a7cbac04..3fec2ac71d 100644 --- a/src/main/resources/languages/th/messages.yml +++ b/src/main/resources/languages/th/messages.yml @@ -54,8 +54,8 @@ guide: main: 'คู่มือ Slimefun' settings: 'ตั้งค่า & แสดงค่าต่างๆ' languages: 'เลือกภาษาที่คุณต้องการ' - credits: 'ผู้มีส่วนร่วมใน Slimefun4' - addons: 'Addons สำหรับ Slimefun4' + credits: 'ผู้มีส่วนร่วมใน Slimefun5' + addons: 'Addons สำหรับ Slimefun5' bugs: 'รายงานบัค' credits: commit: 'ผูกมัด' diff --git a/src/main/resources/languages/tl/messages.yml b/src/main/resources/languages/tl/messages.yml index 08d1463bbb..bdde78a0a2 100644 --- a/src/main/resources/languages/tl/messages.yml +++ b/src/main/resources/languages/tl/messages.yml @@ -88,9 +88,9 @@ guide: main: 'Gabay para sa Slimefun' settings: 'Mga Settings & Impormasyon' languages: 'Pumili ng gustong wika.' - credits: 'Ang mga tumulong sa Slimefun4' - wiki: 'Ang Slimefun4 Wiki' - addons: 'Ang mga Addons para sa Slimefun4' + credits: 'Ang mga tumulong sa Slimefun5' + wiki: 'Ang Slimefun5 Wiki' + addons: 'Ang mga Addons para sa Slimefun5' bugs: 'Mga Bug Reports' source: 'Ang Source Code' versions: 'Mga na-install na versions' diff --git a/src/main/resources/languages/tr/messages.yml b/src/main/resources/languages/tr/messages.yml index eb3a9f2276..90813b03ca 100644 --- a/src/main/resources/languages/tr/messages.yml +++ b/src/main/resources/languages/tr/messages.yml @@ -100,9 +100,9 @@ guide: main: 'Slimefun Rehberi' settings: 'Ayarlar & Bilgi' languages: 'Tercih ettiğiniz dili seçin' - credits: 'Slimefun4 Katkıda Bulunanlar' - wiki: 'Slimefun4 Wiki' - addons: 'Slimefun4 için Eklentiler' + credits: 'Slimefun5 Katkıda Bulunanlar' + wiki: 'Slimefun5 Wiki' + addons: 'Slimefun5 için Eklentiler' bugs: 'Hata Raporları' source: 'Kaynak Kodu' versions: 'Yüklü sürümler' diff --git a/src/main/resources/languages/uk/messages.yml b/src/main/resources/languages/uk/messages.yml index 7546559141..48ce8eda4c 100644 --- a/src/main/resources/languages/uk/messages.yml +++ b/src/main/resources/languages/uk/messages.yml @@ -60,9 +60,9 @@ guide: main: 'Посібник Slimefun' settings: 'Налаштування та інформація' languages: 'Виберіть бажану мову' - credits: 'Автори Slimefun4' - wiki: 'Slimefun4 Вікі' - addons: 'Доповнення до Slimefun4' + credits: 'Автори Slimefun5' + wiki: 'Slimefun5 Вікі' + addons: 'Доповнення до Slimefun5' bugs: 'Звіти про помилки' source: 'Вихідний код' credits: diff --git a/src/main/resources/languages/vi/messages.yml b/src/main/resources/languages/vi/messages.yml index 7fec92891b..e05d8cf078 100644 --- a/src/main/resources/languages/vi/messages.yml +++ b/src/main/resources/languages/vi/messages.yml @@ -82,9 +82,9 @@ guide: main: 'Hướng dẫn sử dụng Slimefun' settings: 'Cài đặt và thông tin' languages: 'Chọn ngôn ngữ ưa thích của bạn' - credits: 'Người đóng góp cho Slimefun4' - wiki: 'Tài liệu Slimefun4' - addons: 'Các bổ sung cho Slimefun4' + credits: 'Người đóng góp cho Slimefun5' + wiki: 'Tài liệu Slimefun5' + addons: 'Các bổ sung cho Slimefun5' bugs: 'Báo cáo lỗi' source: 'Mã nguồn' versions: 'Phiên bản đã cài' diff --git a/src/main/resources/languages/zh-CN/messages.yml b/src/main/resources/languages/zh-CN/messages.yml index e79b887552..a4e6af0b01 100644 --- a/src/main/resources/languages/zh-CN/messages.yml +++ b/src/main/resources/languages/zh-CN/messages.yml @@ -123,9 +123,9 @@ guide: main: 'Slimefun 指南' settings: '设置 & 详情' languages: '选择你想要更改的语言' - credits: 'Slimefun4 贡献者' - wiki: 'Slimefun4 维基' - addons: 'Slimefun4 附属插件' + credits: 'Slimefun5 贡献者' + wiki: 'Slimefun5 维基' + addons: 'Slimefun5 附属插件' bugs: '问题反馈' source: '源代码' versions: '安装的版本' diff --git a/src/main/resources/languages/zh-TW/messages.yml b/src/main/resources/languages/zh-TW/messages.yml index 548f26bce6..622ff36189 100644 --- a/src/main/resources/languages/zh-TW/messages.yml +++ b/src/main/resources/languages/zh-TW/messages.yml @@ -103,9 +103,9 @@ guide: main: 'Slimefun 指南' settings: '設置及資訊' languages: '請選擇您偏好的語言' - credits: 'Slimefun4 貢獻者' - wiki: 'Slimefun4 Wiki' - addons: 'Slimefun4的附加插件' + credits: 'Slimefun5 貢獻者' + wiki: 'Slimefun5 Wiki' + addons: 'Slimefun5的附加插件' bugs: '錯誤報告' source: '原始碼' versions: '安裝版本' diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5e5a3adbe5..bc789cdfde 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ # Name and version name: Slimefun -version: ${project.version} +version: ${version} # Project metadata author: The Slimefun 4 Community @@ -8,7 +8,7 @@ website: https://github.com/Slimefun description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod # Technical settings -main: io.github.thebusybiscuit.slimefun4.implementation.Slimefun +main: io.github.thebusybiscuit.slimefun5.implementation.Slimefun api-version: '1.16' # (Soft) dependencies of Slimefun, we hook into these plugins. diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockSlimefunItem.java b/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockSlimefunItem.java deleted file mode 100644 index 4b374eb309..0000000000 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockSlimefunItem.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; - -import org.bukkit.inventory.ItemStack; - -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; - -public class MockSlimefunItem extends SlimefunItem { - - public MockSlimefunItem(ItemGroup itemGroup, ItemStack item, String id) { - super(itemGroup, new SlimefunItemStack(id, item), RecipeType.NULL, new ItemStack[9]); - } - -} diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/TestPluginClass.java b/src/test/java/io/github/thebusybiscuit/slimefun5/TestPluginClass.java similarity index 92% rename from src/test/java/io/github/thebusybiscuit/slimefun4/TestPluginClass.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/TestPluginClass.java index 1d22dd98ed..e5065fa778 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/TestPluginClass.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/TestPluginClass.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4; +package io.github.thebusybiscuit.slimefun5; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestPluginClass { @@ -81,3 +81,4 @@ void testListenersNotNull() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockBreakEvent.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockBreakEvent.java similarity index 81% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockBreakEvent.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockBreakEvent.java index 9eb9225213..8ac9bcb182 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockBreakEvent.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockBreakEvent.java @@ -1,13 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.api.events; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.block.BlockMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BlockListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +package io.github.thebusybiscuit.slimefun5.api.events; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BlockListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; import me.mrCookieSlime.Slimefun.api.BlockStorage; import org.bukkit.Location; import org.bukkit.Material; @@ -64,7 +67,7 @@ void testEventIsFired() { BlockStorage.addBlockInfo(block, "id", "FOOD_COMPOSTER"); server.getPluginManager().callEvent(new BlockBreakEvent(block, player)); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> true)); } @Test @@ -81,14 +84,14 @@ void testGetters() { BlockStorage.addBlockInfo(block, "id", "FOOD_COMPOSTER"); server.getPluginManager().callEvent(new BlockBreakEvent(block, player)); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> { Assertions.assertEquals(block, e.getBlockBroken()); Assertions.assertEquals(slimefunItem, e.getSlimefunItem()); Assertions.assertEquals(itemStack, e.getHeldItem()); Assertions.assertEquals(player, e.getPlayer()); Assertions.assertFalse(e.isCancelled()); return true; - }); + })); } @Test @@ -113,11 +116,11 @@ public void onBlockBreak(SlimefunBlockBreakEvent event) { BlockBreakEvent blockBreakEvent = new BlockBreakEvent(block, player); server.getPluginManager().callEvent(blockBreakEvent); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> { Assertions.assertTrue(e.isCancelled()); Assertions.assertTrue(blockBreakEvent.isCancelled()); return true; - }); + })); } @Test @@ -135,8 +138,9 @@ void testBlockBreaksGetQueuedForDeletion() { BlockBreakEvent blockBreakEvent = new BlockBreakEvent(block, player); server.getPluginManager().callEvent(blockBreakEvent); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> true)); Assertions.assertTrue(Slimefun.getTickerTask().isDeletedSoon(block.getLocation())); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockPlaceEvent.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockPlaceEvent.java similarity index 84% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockPlaceEvent.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockPlaceEvent.java index c33db57184..4b2f19b8e2 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunBlockPlaceEvent.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunBlockPlaceEvent.java @@ -1,13 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.api.events; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.block.BlockMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.BlockListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +package io.github.thebusybiscuit.slimefun5.api.events; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.BlockListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; import me.mrCookieSlime.Slimefun.api.BlockStorage; import org.bukkit.Location; import org.bukkit.Material; @@ -74,7 +77,7 @@ void testEventIsFired() { ); server.getPluginManager().callEvent(blockPlaceEvent); - server.getPluginManager().assertEventFired(SlimefunBlockPlaceEvent.class, e -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockPlaceEvent.class, e -> true)); } @Test @@ -97,14 +100,14 @@ void testGetters() { ); server.getPluginManager().callEvent(blockPlaceEvent); - server.getPluginManager().assertEventFired(SlimefunBlockPlaceEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockPlaceEvent.class, e -> { Assertions.assertEquals(block, e.getBlockPlaced()); Assertions.assertEquals(slimefunItem, e.getSlimefunItem()); Assertions.assertEquals(itemStack, e.getItemStack()); Assertions.assertEquals(player, e.getPlayer()); Assertions.assertFalse(e.isCancelled()); return true; - }); + })); } @Test @@ -134,11 +137,11 @@ public void onBlockPlace(SlimefunBlockPlaceEvent event) { ); server.getPluginManager().callEvent(blockPlaceEvent); - server.getPluginManager().assertEventFired(SlimefunBlockPlaceEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockPlaceEvent.class, e -> { Assertions.assertTrue(e.isCancelled()); Assertions.assertTrue(blockPlaceEvent.isCancelled()); return true; - }); + })); } @Test @@ -162,14 +165,14 @@ void testBlockPlacementBeforeFullDeletion() { ); server.getPluginManager().callEvent(firstBlockPlaceEvent); - server.getPluginManager().assertEventFired(SlimefunBlockPlaceEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockPlaceEvent.class, e -> { Assertions.assertFalse(e.isCancelled()); return true; - }); + })); // Break block server.getPluginManager().callEvent(new BlockBreakEvent(firstBlock, player)); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> true)); // Assert that the block is not fully deleted Assertions.assertTrue(Slimefun.getTickerTask().isDeletedSoon(firstBlock.getLocation())); @@ -185,3 +188,4 @@ void testBlockPlacementBeforeFullDeletion() { Assertions.assertTrue(secondBlockPlaceEvent.isCancelled()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunRegistryFinalizedEvent.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunRegistryFinalizedEvent.java similarity index 61% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunRegistryFinalizedEvent.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunRegistryFinalizedEvent.java index bef63828c9..38ea492e8e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestSlimefunRegistryFinalizedEvent.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestSlimefunRegistryFinalizedEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.events; +package io.github.thebusybiscuit.slimefun5.api.events; import org.junit.jupiter.api.Assertions; @@ -7,10 +7,13 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.setup.PostSetup; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.setup.PostSetup; class TestSlimefunRegistryFinalizedEvent { @@ -35,8 +38,9 @@ void testEventIsFired() { Assertions.assertDoesNotThrow(() -> PostSetup.loadItems()); // Make sure post setup sent the event - server.getPluginManager().assertEventFired(SlimefunItemRegistryFinalizedEvent.class, ignored -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunItemRegistryFinalizedEvent.class, ignored -> true)); server.getPluginManager().clearEvents(); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestTalismanActivateEvent.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestTalismanActivateEvent.java similarity index 73% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestTalismanActivateEvent.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestTalismanActivateEvent.java index 40cfc61fe5..0236a9958a 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/events/TestTalismanActivateEvent.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/events/TestTalismanActivateEvent.java @@ -1,12 +1,16 @@ -package io.github.thebusybiscuit.slimefun4.api.events; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.TalismanListener; +package io.github.thebusybiscuit.slimefun5.api.events; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.talismans.Talisman; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.TalismanListener; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -71,27 +75,21 @@ void activateAnvilTalisman(boolean enderVariant, boolean inEnderChest) { void testEventIsFired() { // Assert the talisman activates in the inventory activateAnvilTalisman(false, false); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, ignored -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, ignored -> true)); server.getPluginManager().clearEvents(); // Assert the talisman activates in the ender chest activateAnvilTalisman(true, true); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, ignored -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, ignored -> true)); server.getPluginManager().clearEvents(); // Assert the normal talisman does not activate in the ender chest activateAnvilTalisman(false, true); - Assertions.assertThrows( - AssertionError.class, - () -> server.getPluginManager().assertEventFired(TalismanActivateEvent.class, ignored -> true) - ); + assertThat(server.getPluginManager(), not(hasFiredFilteredEvent(TalismanActivateEvent.class, ignored -> true))); // Assert the ender talisman does not activate in the inventory activateAnvilTalisman(true, false); - Assertions.assertThrows( - AssertionError.class, - () -> server.getPluginManager().assertEventFired(TalismanActivateEvent.class, ignored -> true) - ); + assertThat(server.getPluginManager(), not(hasFiredFilteredEvent(TalismanActivateEvent.class, ignored -> true))); } @Test @@ -99,22 +97,22 @@ void testEventIsFired() { void testEventFields() { // Assert the talisman activates in the inventory activateAnvilTalisman(false, false); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertEquals(talisman, event.getTalisman()); Assertions.assertEquals(talisman.getItem(), event.getTalismanItem()); Assertions.assertEquals(player, event.getPlayer()); return true; - }); + })); server.getPluginManager().clearEvents(); // Assert the talisman activates in the ender chest activateAnvilTalisman(true, true); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertEquals(enderTalisman, event.getTalisman()); Assertions.assertEquals(enderTalisman.getItem(), event.getTalismanItem()); Assertions.assertEquals(player, event.getPlayer()); return true; - }); + })); server.getPluginManager().clearEvents(); } @@ -130,18 +128,18 @@ public void onTalismanActivate(TalismanActivateEvent event) { // Assert the talisman activates in the inventory activateAnvilTalisman(false, false); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertTrue(event.isCancelled()); return true; - }); + })); server.getPluginManager().clearEvents(); // Assert the talisman activates in the ender chest activateAnvilTalisman(true, true); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertTrue(event.isCancelled()); return true; - }); + })); server.getPluginManager().clearEvents(); } @@ -157,18 +155,19 @@ public void onTalismanActivate(TalismanActivateEvent event) { // Assert the talisman activates in the inventory activateAnvilTalisman(false, false); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertTrue(event.preventsConsumption()); return true; - }); + })); server.getPluginManager().clearEvents(); // Assert the talisman activates in the ender chest activateAnvilTalisman(true, true); - server.getPluginManager().assertEventFired(TalismanActivateEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(TalismanActivateEvent.class, event -> { Assertions.assertTrue(event.preventsConsumption()); return true; - }); + })); server.getPluginManager().clearEvents(); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/geo/TestResourceRegistration.java similarity index 93% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/geo/TestResourceRegistration.java index 9fba77c29f..07f036296c 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/geo/TestResourceRegistration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.geo; +package io.github.thebusybiscuit.slimefun5.api.geo; import java.util.Optional; @@ -18,12 +18,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.resources.GEOResourcesSetup; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.resources.GEOResourcesSetup; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; @TestMethodOrder(value = OrderAnnotation.class) class TestResourceRegistration { @@ -121,3 +121,4 @@ void testSaltResource() { Assertions.assertTrue(resource.getDefaultSupply(Environment.NORMAL, Biome.SWAMP) > 10); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/gps/TestWaypoints.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/gps/TestWaypoints.java similarity index 87% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/gps/TestWaypoints.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/gps/TestWaypoints.java index 3b769c44a0..161348cf28 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/gps/TestWaypoints.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/gps/TestWaypoints.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.gps; +package io.github.thebusybiscuit.slimefun5.api.gps; import java.io.File; import java.io.IOException; @@ -10,14 +10,17 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.FileUtils; +import io.github.thebusybiscuit.slimefun5.api.events.WaypointCreateEvent; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.FileUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestWaypoints { @@ -114,7 +117,7 @@ void testWaypointEvent() throws InterruptedException { TestUtilities.awaitProfile(player); network.addWaypoint(player, "Hello world", player.getLocation()); - server.getPluginManager().assertEventFired(WaypointCreateEvent.class, event -> event.getPlayer() == player); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(WaypointCreateEvent.class, event -> event.getPlayer() == player)); } @Test @@ -145,3 +148,4 @@ void testIsDeathpoint() throws InterruptedException { Assertions.assertTrue(deathpoint.isDeathpoint()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestDoubleRangeSetting.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestDoubleRangeSetting.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestDoubleRangeSetting.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestDoubleRangeSetting.java index d13d0db64b..5b92588f10 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestDoubleRangeSetting.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestDoubleRangeSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import org.bukkit.Material; import org.junit.jupiter.api.AfterAll; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestDoubleRangeSetting { @@ -76,3 +76,4 @@ void testAllowedValue() { Assertions.assertEquals(0.75, setting.getValue()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestEnumSetting.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestEnumSetting.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestEnumSetting.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestEnumSetting.java index 46df470c91..65ee1ad1a8 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestEnumSetting.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestEnumSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import org.bukkit.Material; import org.junit.jupiter.api.AfterAll; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestEnumSetting { @@ -67,3 +67,4 @@ void testAllowedValue() { Assertions.assertEquals(Material.EMERALD, setting.getAsEnumConstant()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestIntRangeSetting.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestIntRangeSetting.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestIntRangeSetting.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestIntRangeSetting.java index cfb12eb0fc..cdaa91340e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestIntRangeSetting.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestIntRangeSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import org.bukkit.Material; import org.junit.jupiter.api.AfterAll; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestIntRangeSetting { @@ -76,3 +76,4 @@ void testAllowedValue() { Assertions.assertEquals(42, setting.getValue()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestItemSettings.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestItemSettings.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestItemSettings.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestItemSettings.java index 0e043ed7f2..f8506c4242 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestItemSettings.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestItemSettings.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import java.util.Optional; @@ -10,12 +10,12 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.ItemSetting; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestItemSettings { @@ -93,3 +93,4 @@ void testAlreadyExistingItemSetting() { Assertions.assertThrows(IllegalArgumentException.class, () -> item.addItemSetting(setting)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestMaterialTagSetting.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestMaterialTagSetting.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestMaterialTagSetting.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestMaterialTagSetting.java index a62928efec..245014e876 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/items/settings/TestMaterialTagSetting.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/items/settings/TestMaterialTagSetting.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.items.settings; +package io.github.thebusybiscuit.slimefun5.api.items.settings; import java.util.Arrays; import java.util.HashSet; @@ -14,11 +14,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestMaterialTagSetting { @@ -76,3 +76,4 @@ void testAllowedValue() { Assertions.assertIterableEquals(materials, setting.getValue()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestAsyncProfileLoadEvent.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestAsyncProfileLoadEvent.java similarity index 74% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestAsyncProfileLoadEvent.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestAsyncProfileLoadEvent.java index 17ea900f19..243e15cd20 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestAsyncProfileLoadEvent.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestAsyncProfileLoadEvent.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.profiles; +package io.github.thebusybiscuit.slimefun5.api.profiles; import org.bukkit.OfflinePlayer; import org.bukkit.event.Event; @@ -8,15 +8,18 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.events.AsyncProfileLoadEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockProfile; +import io.github.thebusybiscuit.slimefun5.api.events.AsyncProfileLoadEvent; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockProfile; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.OfflinePlayerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.OfflinePlayerMock; class TestAsyncProfileLoadEvent { @@ -41,7 +44,7 @@ void testEventFired() throws InterruptedException { OfflinePlayer player = new OfflinePlayerMock("EventFire"); TestUtilities.awaitProfile(player); - server.getPluginManager().assertEventFired(AsyncProfileLoadEvent.class, Event::isAsynchronous); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(AsyncProfileLoadEvent.class, Event::isAsynchronous)); } @Test @@ -52,7 +55,7 @@ void testEventGetter() throws InterruptedException { OfflinePlayer player = new OfflinePlayerMock("GetProfile"); PlayerProfile profile = TestUtilities.awaitProfile(player); - server.getPluginManager().assertEventFired(AsyncProfileLoadEvent.class, e -> e.getProfile().equals(profile)); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(AsyncProfileLoadEvent.class, e -> e.getProfile().equals(profile))); } @Test @@ -93,3 +96,4 @@ void testProfileMismatch() throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestGuideHistory.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestGuideHistory.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestGuideHistory.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestGuideHistory.java index 214cca3c0c..a1f0491471 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestGuideHistory.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestGuideHistory.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.profiles; +package io.github.thebusybiscuit.slimefun5.api.profiles; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -11,15 +11,15 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.core.guide.GuideHistory; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.core.guide.GuideHistory; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestGuideHistory { @@ -135,3 +135,4 @@ void testItemGroup() throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerBackpacks.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerBackpacks.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerBackpacks.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerBackpacks.java index 90d475d479..ca56bfdb7e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerBackpacks.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerBackpacks.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.profiles; +package io.github.thebusybiscuit.slimefun5.api.profiles; import java.util.Optional; @@ -9,13 +9,13 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestPlayerBackpacks { @@ -99,3 +99,4 @@ void testGetBackpackById() throws InterruptedException { Assertions.assertFalse(profile.getBackpack(500).isPresent()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerProfile.java b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerProfile.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerProfile.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerProfile.java index 61c49f0c32..8f8b079903 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerProfile.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/api/profiles/TestPlayerProfile.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.api.profiles; +package io.github.thebusybiscuit.slimefun5.api.profiles; import java.util.Iterator; import java.util.Optional; @@ -11,14 +11,14 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.HashedArmorpiece; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.HashedArmorpiece; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.OfflinePlayerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.OfflinePlayerMock; class TestPlayerProfile { @@ -139,3 +139,4 @@ void testHashCode() throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestBackpackCommand.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestBackpackCommand.java similarity index 70% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestBackpackCommand.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestBackpackCommand.java index 8443fdd0f5..dd214729f1 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestBackpackCommand.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestBackpackCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import java.util.List; @@ -14,15 +14,18 @@ import org.junit.jupiter.params.provider.ValueSource; import io.github.bakedlibs.dough.common.CommonPatterns; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.command.CommandResultSucceedMatcher.hasSucceeded; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestBackpackCommand { @@ -61,7 +64,7 @@ void testValidBackpack() throws InterruptedException { PlayerProfile profile = TestUtilities.awaitProfile(player); PlayerBackpack backpack = profile.createBackpack(54); - server.execute("slimefun", player, "backpack", player.getName(), String.valueOf(backpack.getId())).assertSucceeded(); + assertThat(server.execute("slimefun", player, "backpack", player.getName(), String.valueOf(backpack.getId())), hasSucceeded()); Assertions.assertTrue(hasBackpack(player, backpack.getId())); } @@ -74,10 +77,11 @@ void testNonExistentBackpacks(String id) throws InterruptedException { player.setOp(true); TestUtilities.awaitProfile(player); - server.execute("slimefun", player, "backpack", player.getName(), id).assertSucceeded(); + assertThat(server.execute("slimefun", player, "backpack", player.getName(), id), hasSucceeded()); if (CommonPatterns.NUMERIC.matcher(id).matches()) { Assertions.assertFalse(hasBackpack(player, Integer.parseInt(id))); } } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestChargeCommand.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestChargeCommand.java similarity index 77% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestChargeCommand.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestChargeCommand.java index 6a10937092..cd1a5570e0 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestChargeCommand.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestChargeCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -9,17 +9,17 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.LoreBuilder; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestChargeCommand { @@ -72,4 +72,4 @@ public float getMaxItemCharge(ItemStack item) { } } -} \ No newline at end of file +} diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestDebugFishCommand.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestDebugFishCommand.java similarity index 62% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestDebugFishCommand.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestDebugFishCommand.java index e91cd45e14..89d237b590 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestDebugFishCommand.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestDebugFishCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import org.bukkit.entity.Player; import org.junit.jupiter.api.AfterAll; @@ -8,12 +8,15 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.command.CommandResultSucceedMatcher.hasSucceeded; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestDebugFishCommand { @@ -36,8 +39,9 @@ public static void unload() { void testCommand(boolean op) { Player player = server.addPlayer(); player.setOp(op); - server.execute("slimefun", player, "debug_fish").assertSucceeded(); + assertThat(server.execute("slimefun", player, "debug_fish"), hasSucceeded()); Assertions.assertEquals(op, SlimefunUtils.containsSimilarItem(player.getInventory(), SlimefunItems.DEBUG_FISH.item(), true)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestGuideCommand.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestGuideCommand.java similarity index 64% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestGuideCommand.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestGuideCommand.java index 57560503a7..89d8b05ca3 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestGuideCommand.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestGuideCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -9,13 +9,16 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.command.CommandResultSucceedMatcher.hasSucceeded; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestGuideCommand { @@ -39,8 +42,9 @@ void testCommand(boolean op) { Player player = server.addPlayer(); player.setOp(op); boolean hasPermission = player.hasPermission("slimefun.command.guide"); - server.execute("slimefun", player, "guide").assertSucceeded(); + assertThat(server.execute("slimefun", player, "guide"), hasSucceeded()); ItemStack guide = SlimefunGuide.getItem(SlimefunGuideMode.SURVIVAL_MODE); Assertions.assertEquals(hasPermission, SlimefunUtils.containsSimilarItem(player.getInventory(), guide, true)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestResearchCommand.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestResearchCommand.java similarity index 69% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestResearchCommand.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestResearchCommand.java index 00fdecdb9a..3539d2a42c 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/commands/TestResearchCommand.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/commands/TestResearchCommand.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.commands; +package io.github.thebusybiscuit.slimefun5.core.commands; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; @@ -8,13 +8,16 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.command.CommandResultSucceedMatcher.hasSucceeded; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestResearchCommand { @@ -46,7 +49,7 @@ void testResearchAll() throws InterruptedException { Player player = server.addPlayer(); PlayerProfile profile = TestUtilities.awaitProfile(player); - server.executeConsole("slimefun", "research", player.getName(), "all").assertSucceeded(); + assertThat(server.executeConsole("slimefun", "research", player.getName(), "all"), hasSucceeded()); Assertions.assertTrue(profile.hasUnlocked(research)); Assertions.assertTrue(profile.hasUnlocked(research2)); @@ -59,7 +62,7 @@ void testResearchSpecific() throws InterruptedException { Player player = server.addPlayer(); PlayerProfile profile = TestUtilities.awaitProfile(player); - server.executeConsole("slimefun", "research", player.getName(), research.getKey().toString()).assertSucceeded(); + assertThat(server.executeConsole("slimefun", "research", player.getName(), research.getKey().toString()), hasSucceeded()); Assertions.assertTrue(profile.hasUnlocked(research)); Assertions.assertFalse(profile.hasUnlocked(research2)); @@ -72,14 +75,15 @@ void testResearchReset() throws InterruptedException { Player player = server.addPlayer(); PlayerProfile profile = TestUtilities.awaitProfile(player); - server.executeConsole("slimefun", "research", player.getName(), "all").assertSucceeded(); + assertThat(server.executeConsole("slimefun", "research", player.getName(), "all"), hasSucceeded()); Assertions.assertTrue(profile.hasUnlocked(research)); Assertions.assertTrue(profile.hasUnlocked(research2)); - server.executeConsole("slimefun", "research", player.getName(), "reset").assertSucceeded(); + assertThat(server.executeConsole("slimefun", "research", player.getName(), "reset"), hasSucceeded()); Assertions.assertFalse(profile.hasUnlocked(research)); Assertions.assertFalse(profile.hasUnlocked(research2)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/debug/TestDebugLogging.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/debug/TestDebugLogging.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/debug/TestDebugLogging.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/debug/TestDebugLogging.java index cc7caf76ca..49980842b7 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/debug/TestDebugLogging.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/debug/TestDebugLogging.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.debug; +package io.github.thebusybiscuit.slimefun5.core.debug; import java.text.MessageFormat; import java.util.logging.Handler; @@ -12,9 +12,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestDebugLogging { @@ -134,3 +134,4 @@ void testMessageAwkwardPattern() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/guide/TestGuideOpening.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/guide/TestGuideOpening.java similarity index 91% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/guide/TestGuideOpening.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/guide/TestGuideOpening.java index b7a9a20d1c..0bef0fb870 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/guide/TestGuideOpening.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/guide/TestGuideOpening.java @@ -1,11 +1,11 @@ -package io.github.thebusybiscuit.slimefun4.core.guide; +package io.github.thebusybiscuit.slimefun5.core.guide; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.guide.SurvivalSlimefunGuide; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -19,14 +19,14 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestGuideOpening { @@ -143,3 +143,4 @@ void testGoBack() throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/TestMultiBlocks.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/TestMultiBlocks.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/TestMultiBlocks.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/TestMultiBlocks.java index 93fb5ef75f..2e544b54cd 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/TestMultiBlocks.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/multiblocks/TestMultiBlocks.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.multiblocks; +package io.github.thebusybiscuit.slimefun5.core.multiblocks; import org.bukkit.Material; import org.bukkit.block.BlockFace; @@ -9,11 +9,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestMultiBlocks { @@ -120,3 +120,4 @@ void testNotEqual() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/networks/TestNetworkManager.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/networks/TestNetworkManager.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/networks/TestNetworkManager.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/networks/TestNetworkManager.java index 4ac8db287e..9202ebc958 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/networks/TestNetworkManager.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/networks/TestNetworkManager.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.networks; +package io.github.thebusybiscuit.slimefun5.core.networks; import java.util.HashMap; import java.util.List; @@ -16,13 +16,13 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mockito; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.api.network.NetworkComponent; -import io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockNetwork; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.api.network.NetworkComponent; +import io.github.thebusybiscuit.slimefun5.core.networks.cargo.CargoNet; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockNetwork; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestNetworkManager { @@ -189,3 +189,4 @@ void testNullLocations() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestProfileResearches.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestProfileResearches.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestProfileResearches.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestProfileResearches.java index c6072275eb..5868572089 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestProfileResearches.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestProfileResearches.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.researching; +package io.github.thebusybiscuit.slimefun5.core.researching; import java.util.Arrays; @@ -10,13 +10,13 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestProfileResearches { @@ -103,3 +103,4 @@ void testGetResearches() throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearchUnlocking.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearchUnlocking.java similarity index 76% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearchUnlocking.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearchUnlocking.java index 7d376cc111..8abb106951 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearchUnlocking.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearchUnlocking.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.researching; +package io.github.thebusybiscuit.slimefun5.core.researching; import java.util.Optional; import java.util.concurrent.CountDownLatch; @@ -14,13 +14,16 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import io.github.thebusybiscuit.slimefun4.api.events.ResearchUnlockEvent; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.ResearchUnlockEvent; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestResearchUnlocking { @@ -63,12 +66,12 @@ void testUnlock(boolean instant) throws InterruptedException { Player p = awaitUnlock(player, research, instant); Optional profile = PlayerProfile.find(p); - server.getPluginManager().assertEventFired(ResearchUnlockEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(ResearchUnlockEvent.class, event -> { Assertions.assertEquals(p, event.getPlayer()); Assertions.assertEquals(research, event.getResearch()); Assertions.assertFalse(event.isCancelled()); return true; - }); + })); Assertions.assertEquals(player, p); Assertions.assertTrue(profile.isPresent()); @@ -76,3 +79,4 @@ void testUnlock(boolean instant) throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearches.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearches.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearches.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearches.java index 21bb2b2f3e..93f7f5ba17 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearches.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/researching/TestResearches.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.researching; +package io.github.thebusybiscuit.slimefun5.core.researching; import java.util.Optional; @@ -14,16 +14,19 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerPreResearchEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideImplementation; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerPreResearchEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideImplementation; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestResearches { @@ -203,13 +206,14 @@ void testPreCanUnlockResearchEvent() throws InterruptedException { research.unlockFromGuide(guide, player, profile, sfItem, sfItem.getItemGroup(), 0); - server.getPluginManager().assertEventFired(PlayerPreResearchEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerPreResearchEvent.class, event -> { Assertions.assertEquals(player, event.getPlayer()); Assertions.assertEquals(research, event.getResearch()); Assertions.assertEquals(sfItem, event.getSlimefunItem()); Assertions.assertFalse(event.isCancelled()); return true; - }); + })); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestBlockDataService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestBlockDataService.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestBlockDataService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestBlockDataService.java index 909f050f26..a340b4a6f0 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestBlockDataService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestBlockDataService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestBlockDataService { @@ -52,3 +52,4 @@ void testTileEntities() { Assertions.assertTrue(service.isTileEntity(Material.PLAYER_WALL_HEAD)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestCustomTextureService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestCustomTextureService.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestCustomTextureService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestCustomTextureService.java index 919de0d374..6a383498d0 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestCustomTextureService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestCustomTextureService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Arrays; @@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestCustomTextureService { @@ -76,3 +76,4 @@ void testSetTexture() { Assertions.assertEquals(300, stack.getItemMeta().getCustomModelData()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestItemDataService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestItemDataService.java similarity index 92% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestItemDataService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestItemDataService.java index ec323ff6f4..6c4f038c1d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestItemDataService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestItemDataService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Optional; @@ -12,9 +12,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestItemDataService { @@ -70,3 +70,4 @@ void testSetDataItemMeta() { Assertions.assertEquals("Hello World", data2.get()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestPermissionsService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestPermissionsService.java similarity index 93% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestPermissionsService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestPermissionsService.java index 0c0bf143e3..271ad4556f 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestPermissionsService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestPermissionsService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Arrays; import java.util.Optional; @@ -16,12 +16,12 @@ import org.junit.jupiter.params.provider.ValueSource; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestPermissionsService { @@ -128,3 +128,4 @@ void testHasPermissionSet() { Assertions.assertTrue(service.hasPermission(player, item)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestRecipeService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestRecipeService.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestRecipeService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestRecipeService.java index bc30dbf583..c04fe4aed3 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestRecipeService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestRecipeService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; @@ -19,10 +19,10 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.recipes.RecipeSnapshot; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestRecipeService { @@ -46,7 +46,8 @@ void testRecipe() { MinecraftRecipeService service = new MinecraftRecipeService(plugin); NamespacedKey key = new NamespacedKey(plugin, "furnace_recipe_test"); - ItemStack result = new ItemStack(Material.EMERALD_BLOCK); + // Use DRAGON_EGG as it has no pre-existing vanilla recipe in MockBukkit + ItemStack result = new ItemStack(Material.DRAGON_EGG); FurnaceRecipe recipe = new FurnaceRecipe(key, result, new MaterialChoice(Material.DIAMOND), 1, 2); server.addRecipe(recipe); @@ -170,3 +171,4 @@ void testSubscriptions() { Assertions.assertNotNull(reference.get()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestUpdaterService.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestUpdaterService.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestUpdaterService.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestUpdaterService.java index 4de8e01e62..eec23bf3d1 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/TestUpdaterService.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/TestUpdaterService.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services; +package io.github.thebusybiscuit.slimefun5.core.services; import java.io.File; @@ -8,10 +8,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.SlimefunBranch; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestUpdaterService { @@ -68,3 +68,4 @@ void testUnknownBuilds() { Assertions.assertEquals(-1, service.getBuildNumber()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/AbstractLocaleRegexChecker.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/AbstractLocaleRegexChecker.java similarity index 97% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/AbstractLocaleRegexChecker.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/AbstractLocaleRegexChecker.java index df8668f285..600258cb72 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/AbstractLocaleRegexChecker.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/AbstractLocaleRegexChecker.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import java.io.BufferedReader; import java.io.IOException; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.provider.Arguments; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class AbstractLocaleRegexChecker { @@ -110,3 +110,4 @@ void assertNoRegexMatch(String location, String value) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestColorCodes.java similarity index 96% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestColorCodes.java index 88371ac0ee..bf2ff32e1d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestColorCodes.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; @@ -45,3 +45,4 @@ void testSpelling(LanguagePreset lang, LanguageFile file) throws IOException, In } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestSlimefunSpelling.java b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestSlimefunSpelling.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestSlimefunSpelling.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestSlimefunSpelling.java index dd8b62be3a..bc2cf4da85 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestSlimefunSpelling.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/core/services/localization/TestSlimefunSpelling.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.core.services.localization; +package io.github.thebusybiscuit.slimefun5.core.services.localization; import java.io.IOException; import java.util.regex.Pattern; @@ -38,3 +38,4 @@ void testSpelling(LanguagePreset lang, LanguageFile file) throws IOException, In } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestDamageableItem.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestDamageableItem.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestDamageableItem.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestDamageableItem.java index 7a97e33cf3..25106701e4 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestDamageableItem.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestDamageableItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import javax.annotation.Nullable; @@ -14,15 +14,15 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockDamageable; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockDamageable; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestDamageableItem { @@ -101,3 +101,4 @@ void testDamageableItemCaresUnbreaking() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestRadioactiveItem.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestRadioactiveItem.java similarity index 72% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestRadioactiveItem.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestRadioactiveItem.java index 6c7853da2d..7c2e9a8120 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestRadioactiveItem.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestRadioactiveItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -9,14 +9,14 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestRadioactiveItem { @@ -45,3 +45,4 @@ void testWikiPages(Radioactivity radioactivity) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestSlimefunItem.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestSlimefunItem.java similarity index 92% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestSlimefunItem.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestSlimefunItem.java index 421a4248f3..55a879b846 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestSlimefunItem.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/TestSlimefunItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items; +package io.github.thebusybiscuit.slimefun5.implementation.items; import java.util.Optional; @@ -11,14 +11,14 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.exceptions.UnregisteredItemException; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.exceptions.UnregisteredItemException; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestSlimefunItem { @@ -50,7 +50,7 @@ void testWikiPages() { Optional wiki = item.getWikipage(); Assertions.assertTrue(wiki.isPresent()); - Assertions.assertEquals("https://github.com/Slimefun/Slimefun4/wiki/Test", wiki.get()); + Assertions.assertEquals("https://github.com/Slimefun5/Slimefun5/wiki/Test", wiki.get()); } @Test @@ -165,3 +165,4 @@ void testHashCode() { Assertions.assertNotEquals(item2.hashCode(), differentItem.hashCode()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAbstractRecipe.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAbstractRecipe.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAbstractRecipe.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAbstractRecipe.java index 2fa377c86e..4b79b786e0 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAbstractRecipe.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAbstractRecipe.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import java.util.Arrays; import java.util.HashSet; @@ -19,9 +19,9 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestAbstractRecipe { @@ -88,3 +88,4 @@ void testInvalidRecipes() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAutoCrafter.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAutoCrafter.java similarity index 93% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAutoCrafter.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAutoCrafter.java index 0158b7cb86..4473981e2b 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/TestAutoCrafter.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/autocrafters/TestAutoCrafter.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters; +package io.github.thebusybiscuit.slimefun5.implementation.items.autocrafters; import javax.annotation.Nonnull; @@ -14,16 +14,16 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.inventory.ChestInventoryMock; -import be.seeseemelk.mockbukkit.inventory.InventoryMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.inventory.ChestInventoryMock; +import org.mockbukkit.mockbukkit.inventory.InventoryMock; class TestAutoCrafter { @@ -207,3 +207,4 @@ private AbstractAutoCrafter getVanillaAutoCrafter() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/TestEnderBackpack.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/TestEnderBackpack.java similarity index 76% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/TestEnderBackpack.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/TestEnderBackpack.java index 62b22112a1..d5053e4517 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/TestEnderBackpack.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/backpacks/TestEnderBackpack.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.backpacks; +package io.github.thebusybiscuit.slimefun5.implementation.items.backpacks; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -9,14 +9,14 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestEnderBackpack implements SlimefunItemTest { @@ -55,3 +55,4 @@ void testRightClickBehaviour() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestDietCookie.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestDietCookie.java similarity index 63% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestDietCookie.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestDietCookie.java index 693e5f03cf..7122be2a52 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestDietCookie.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestDietCookie.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -9,16 +9,19 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.services.sounds.SoundEffect; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.sound.SoundReceiverSoundHeardMatcher.hasHeard; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestDietCookie implements SlimefunItemTest { @@ -52,8 +55,9 @@ void testConsumptionBehaviour() { simulateConsumption(player, cookie); - player.assertSoundHeard(SoundEffect.DIET_COOKIE_CONSUME_SOUND.getDefaultSoundId()); + assertThat(player, hasHeard(SoundEffect.DIET_COOKIE_CONSUME_SOUND.getDefaultSoundId())); Assertions.assertTrue(player.hasPotionEffect(PotionEffectType.LEVITATION)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMeatJerky.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMeatJerky.java similarity index 73% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMeatJerky.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMeatJerky.java index ea78037705..96db660d62 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMeatJerky.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMeatJerky.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -8,15 +8,15 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestMeatJerky implements SlimefunItemTest { @@ -56,3 +56,4 @@ void testConsumptionBehaviour() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMonsterJerky.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMonsterJerky.java similarity index 75% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMonsterJerky.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMonsterJerky.java index ed279f4e93..d95b43e78c 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/TestMonsterJerky.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/food/TestMonsterJerky.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.food; +package io.github.thebusybiscuit.slimefun5.implementation.items.food; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -9,15 +9,15 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestMonsterJerky implements SlimefunItemTest { @@ -57,3 +57,4 @@ void testConsumptionBehaviour() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestClimbingPick.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestClimbingPick.java similarity index 84% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestClimbingPick.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestClimbingPick.java index 9a43bc12f5..98f781fac4 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestClimbingPick.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestClimbingPick.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.stream.Stream; @@ -18,20 +18,23 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import io.github.thebusybiscuit.slimefun4.api.events.ClimbingPickLaunchEvent; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; -import io.github.thebusybiscuit.slimefun4.utils.compatibility.VersionedEnchantment; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.block.BlockMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import io.github.thebusybiscuit.slimefun5.api.events.ClimbingPickLaunchEvent; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.utils.compatibility.VersionedEnchantment; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestClimbingPick implements SlimefunItemTest { @@ -139,7 +142,7 @@ void testItemUse(BlockFace face) { if (shouldFireEvent) { Assertions.assertTrue(pick.getClimbingSpeed(block.getType()) > 0); Assertions.assertTrue(player.getVelocity().length() > 0); - server.getPluginManager().assertEventFired(ClimbingPickLaunchEvent.class, e -> e.getPlayer() == player && e.getPick() == pick); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(ClimbingPickLaunchEvent.class, e -> e.getPlayer() == player && e.getPick() == pick)); } else { Assertions.assertEquals(0, player.getVelocity().length()); } @@ -168,3 +171,4 @@ private ItemStack getPickWithEfficiency(@Nonnull ClimbingPick pick, int level) { return item; } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestPortableDustbin.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestPortableDustbin.java similarity index 77% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestPortableDustbin.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestPortableDustbin.java index 8b9d710a37..6ed3d70026 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestPortableDustbin.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestPortableDustbin.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -10,14 +10,14 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestPortableDustbin implements SlimefunItemTest { @@ -57,3 +57,4 @@ void testRightClickBehaviour() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestTapeMeasure.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestTapeMeasure.java similarity index 84% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestTapeMeasure.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestTapeMeasure.java index 6a05e5c34e..d68d550c78 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/TestTapeMeasure.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/items/tools/TestTapeMeasure.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; +package io.github.thebusybiscuit.slimefun5.implementation.items.tools; import java.util.Optional; import java.util.OptionalDouble; @@ -15,17 +15,20 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.presets.SlimefunItemTest; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.presets.SlimefunItemTest; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.WorldMock; -import be.seeseemelk.mockbukkit.block.BlockMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.sound.SoundReceiverSoundHeardMatcher.hasHeard; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.world.WorldMock; +import org.mockbukkit.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestTapeMeasure implements SlimefunItemTest { @@ -108,7 +111,7 @@ void testMeasuringFeedback() { player.setSneaking(false); simulateRightClickBlock(player, tm, item, block2, BlockFace.UP); - player.assertSoundHeard(Sound.ITEM_BOOK_PUT); + assertThat(player, hasHeard(Sound.ITEM_BOOK_PUT)); } @Test @@ -146,3 +149,4 @@ void testOtherWorld() { Assertions.assertFalse(tm.getAnchor(player, item).isPresent()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MockBeeProtectionSuit.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MockBeeProtectionSuit.java similarity index 63% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MockBeeProtectionSuit.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MockBeeProtectionSuit.java index bea038257c..da9cc13cc2 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MockBeeProtectionSuit.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/MockBeeProtectionSuit.java @@ -1,15 +1,15 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectiveArmor; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectiveArmor; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; class MockBeeProtectionSuit extends SlimefunArmorPiece implements ProtectiveArmor { @@ -33,3 +33,4 @@ public NamespacedKey getArmorSetId() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestAnvilListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestAnvilListener.java similarity index 84% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestAnvilListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestAnvilListener.java index 52fc8fad5e..c3ddf58ae9 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestAnvilListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestAnvilListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -17,14 +17,14 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.AnvilListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.AnvilListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestAnvilListener { @@ -79,3 +79,4 @@ void testAnvilWithVanillaItem() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBackpackListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBackpackListener.java similarity index 85% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBackpackListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBackpackListener.java index f8e1b299a0..b5953ef1c0 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBackpackListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBackpackListener.java @@ -1,20 +1,20 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.ItemEntityMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.ItemMock; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.mocks.InventoryViewWrapper; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.SlimefunBackpack; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.mocks.InventoryViewWrapper; +import io.github.thebusybiscuit.slimefun5.utils.tags.SlimefunTag; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -127,7 +127,7 @@ void testBackpackDropNormalItem() throws InterruptedException { Player player = server.addPlayer(); openMockBackpack(player, "DROP_NORMAL_ITEM_BACKPACK_TEST", 27); - Item item = new ItemEntityMock(server, UUID.randomUUID(), new ItemStack(Material.SUGAR_CANE)); + Item item = new ItemMock(server, UUID.randomUUID(), new ItemStack(Material.SUGAR_CANE)); PlayerDropItemEvent event = new PlayerDropItemEvent(player, item); listener.onItemDrop(event); @@ -136,10 +136,12 @@ void testBackpackDropNormalItem() throws InterruptedException { private boolean isAllowed(String id, ItemStack item) throws InterruptedException { Player player = server.addPlayer(); - Inventory inv = openMockBackpack(player, id, 9).getInventory(); + openMockBackpack(player, id, 9); + // Use the view's top inventory so getCurrentItem() sees the item + Inventory topInv = player.getOpenInventory().getTopInventory(); int slot = 7; - inv.setItem(slot, item); + topInv.setItem(slot, item); InventoryClickEvent event = new InventoryClickEvent(player.getOpenInventory(), SlotType.CONTAINER, slot, ClickType.LEFT, InventoryAction.PICKUP_ONE); listener.onClick(event); return !event.isCancelled(); @@ -175,3 +177,4 @@ void testHotbarKey(Material type) throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBeeListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBeeListener.java similarity index 64% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBeeListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBeeListener.java index fbc563ea6f..99f3359ae6 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBeeListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBeeListener.java @@ -1,10 +1,18 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; + +import java.util.EnumMap; + +import com.google.common.base.Function; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableMap; import org.bukkit.Material; +import org.bukkit.damage.DamageSource; import org.bukkit.entity.Bee; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -13,15 +21,15 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mockito; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.BeeListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.BeeListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestBeeListener { @@ -41,6 +49,7 @@ public static void unload() { MockBukkit.unmock(); } + @SuppressWarnings("deprecation") @ParameterizedTest @DisplayName("Test Bee damage protection") @ValueSource(booleans = { true, false }) @@ -62,7 +71,11 @@ void testBeeDamage(boolean hasArmor) throws InterruptedException { double damage = 7.5; Bee bee = Mockito.mock(Bee.class); - EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(bee, player, DamageCause.ENTITY_ATTACK, damage); + DamageSource source = Mockito.mock(DamageSource.class); + EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(bee, player, DamageCause.ENTITY_ATTACK, source, + new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, damage)), + new EnumMap>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))), + false); listener.onDamage(event); if (hasArmor) { @@ -73,3 +86,4 @@ void testBeeDamage(boolean hasArmor) throws InterruptedException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBrewingStandListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBrewingStandListener.java similarity index 85% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBrewingStandListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBrewingStandListener.java index 660656cd07..941032fe29 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestBrewingStandListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestBrewingStandListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.block.BrewingStand; @@ -19,14 +19,14 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.BrewingStandListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.BrewingStandListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestBrewingStandListener { @@ -83,3 +83,4 @@ void testBrewingWithVanillaItem() { Assertions.assertEquals(Result.ALLOW, event.getResult()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCargoNodeListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCargoNodeListener.java similarity index 87% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCargoNodeListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCargoNodeListener.java index 721ab21ea2..38bcd54304 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCargoNodeListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCargoNodeListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Location; import org.bukkit.Material; @@ -16,16 +16,16 @@ import org.junit.jupiter.params.ParameterizedTest; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.cargo.CargoInputNode; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.providers.SlimefunItemsSource; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.cargo.CargoInputNode; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.providers.SlimefunItemsSource; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestCargoNodeListener { @@ -113,3 +113,4 @@ void testNonCargoNode() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCartographyTableListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCartographyTableListener.java similarity index 83% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCartographyTableListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCartographyTableListener.java index b872c45341..b576c1bbd5 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCartographyTableListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCartographyTableListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -17,14 +17,14 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.CartographyTableListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.CartographyTableListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestCartographyTableListener { @@ -73,3 +73,4 @@ void testCartographyTableWithVanillaItem() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCauldronListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCauldronListener.java similarity index 87% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCauldronListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCauldronListener.java index c3072d162e..8a9c6a1e15 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCauldronListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCauldronListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.block.Block; @@ -16,15 +16,15 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.CauldronListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.CauldronListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.block.BlockMock; class TestCauldronListener { @@ -105,3 +105,4 @@ void testCauldronWithVanillaLeatherArmor() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCoolerListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCoolerListener.java similarity index 71% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCoolerListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCoolerListener.java index 2793b76e11..db73b09d50 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCoolerListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCoolerListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Color; import org.bukkit.Material; @@ -15,18 +15,21 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.CoolerFeedPlayerEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerBackpack; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.Cooler; -import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.events.CoolerFeedPlayerEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerBackpack; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.backpacks.Cooler; +import io.github.thebusybiscuit.slimefun5.implementation.items.food.Juice; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestCoolerListener { @@ -78,10 +81,11 @@ void testCoolerUsage() throws InterruptedException { new BackpackListener().setBackpackId(player, personalCooler, 1, backpack.getId()); player.getInventory().setItem(7, personalCooler); - FoodLevelChangeEvent event = new FoodLevelChangeEvent(player, 16); + FoodLevelChangeEvent event = new FoodLevelChangeEvent(player, 16, null); listener.onHungerLoss(event); Assertions.assertTrue(player.hasPotionEffect(PotionEffectType.HEALTH_BOOST)); - server.getPluginManager().assertEventFired(CoolerFeedPlayerEvent.class, e -> e.getPlayer() == player && e.getCooler() == cooler); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(CoolerFeedPlayerEvent.class, e -> e.getPlayer() == player && e.getCooler() == cooler)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCraftingTableListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCraftingTableListener.java similarity index 87% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCraftingTableListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCraftingTableListener.java index e78d3f00fd..6d508a7c88 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestCraftingTableListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestCraftingTableListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.apache.commons.lang.mutable.MutableObject; import org.bukkit.Material; @@ -22,14 +22,14 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.CraftingTableListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.CraftingTableListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestCraftingTableListener { @@ -54,6 +54,8 @@ private CraftItemEvent mockCraftingEvent(ItemStack item) { Player player = server.addPlayer(); CraftingInventory inv = Mockito.mock(CraftingInventory.class); + Mockito.when(inv.getType()).thenReturn(org.bukkit.event.inventory.InventoryType.CRAFTING); + Mockito.when(inv.getSize()).thenReturn(10); Mockito.when(inv.getContents()).thenReturn(new ItemStack[] { item, null, null, null, null, null, null, null, null }); InventoryView view = player.openInventory(inv); @@ -67,6 +69,8 @@ private PrepareItemCraftEvent mockPreCraftingEvent(ItemStack item) { Player player = server.addPlayer(); CraftingInventory inv = Mockito.mock(CraftingInventory.class); + Mockito.when(inv.getType()).thenReturn(org.bukkit.event.inventory.InventoryType.CRAFTING); + Mockito.when(inv.getSize()).thenReturn(10); MutableObject result = new MutableObject(new ItemStack(Material.EMERALD)); Mockito.doAnswer(invocation -> { @@ -148,3 +152,4 @@ void testPreCraftEventWithVanillaItem() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestDeathpointListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestDeathpointListener.java similarity index 57% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestDeathpointListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestDeathpointListener.java index c47d93a9d7..c81baafadf 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestDeathpointListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestDeathpointListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.entity.Player; import org.junit.jupiter.api.AfterAll; @@ -7,13 +7,17 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.events.WaypointCreateEvent; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestDeathpointListener { @@ -39,7 +43,7 @@ void testNoTransmitter() throws InterruptedException { TestUtilities.awaitProfile(player); player.setHealth(0); - Assertions.assertThrows(AssertionError.class, () -> server.getPluginManager().assertEventFired(WaypointCreateEvent.class, event -> event.getPlayer() == player && event.isDeathpoint())); + assertThat(server.getPluginManager(), not(hasFiredFilteredEvent(WaypointCreateEvent.class, event -> event.getPlayer() == player && event.isDeathpoint()))); } @Test @@ -50,7 +54,8 @@ void testTransmitter() throws InterruptedException { player.getInventory().setItem(8, SlimefunItems.GPS_EMERGENCY_TRANSMITTER.item()); player.setHealth(0); - server.getPluginManager().assertEventFired(WaypointCreateEvent.class, event -> event.getPlayer() == player && event.isDeathpoint()); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(WaypointCreateEvent.class, event -> event.getPlayer() == player && event.isDeathpoint())); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestFireworksListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestFireworksListener.java similarity index 53% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestFireworksListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestFireworksListener.java index bcea6c1817..f41028a93d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestFireworksListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestFireworksListener.java @@ -1,22 +1,32 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; + +import java.util.EnumMap; + +import com.google.common.base.Function; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableMap; import org.bukkit.Color; +import org.bukkit.damage.DamageSource; import org.bukkit.entity.Firework; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.FireworksListener; -import io.github.thebusybiscuit.slimefun4.utils.FireworkUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.FireworksListener; +import io.github.thebusybiscuit.slimefun5.utils.FireworkUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockito.Mockito; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestFireworksListener { @@ -33,15 +43,21 @@ public static void unload() { MockBukkit.unmock(); } + @SuppressWarnings("deprecation") @Test @DisplayName("Test if Fireworks from Research cause no damage") void testFireworkDamage() { Player player = server.addPlayer(); Firework firework = FireworkUtils.createFirework(player.getLocation(), Color.BLUE); - EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(firework, player, DamageCause.ENTITY_EXPLOSION, 6.0); + DamageSource source = Mockito.mock(DamageSource.class); + EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(firework, player, DamageCause.ENTITY_EXPLOSION, source, + new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 6.0)), + new EnumMap>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))), + false); server.getPluginManager().callEvent(event); Assertions.assertTrue(event.isCancelled()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestGrindstoneListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestGrindstoneListener.java similarity index 83% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestGrindstoneListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestGrindstoneListener.java index fa62fca496..b3e3ce6992 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestGrindstoneListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestGrindstoneListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -19,16 +19,16 @@ import org.junit.jupiter.params.provider.EnumSource; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.GrindstoneListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.GrindstoneListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestGrindstoneListener { @@ -90,3 +90,4 @@ void testGrindStoneWithSlimefunGuide(SlimefunGuideMode layout) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestIronGolemListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestIronGolemListener.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestIronGolemListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestIronGolemListener.java index 2877ee683b..1a5eb0ff7d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestIronGolemListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestIronGolemListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -15,14 +15,14 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.IronGolemListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.IronGolemListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestIronGolemListener { @@ -103,3 +103,4 @@ void testWithVanillaIron() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestItemPickupListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestItemPickupListener.java similarity index 82% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestItemPickupListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestItemPickupListener.java index b5f35bccfa..f66923fa06 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestItemPickupListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestItemPickupListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; @@ -17,14 +17,14 @@ import org.junit.jupiter.params.provider.ValueSource; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientPedestal; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.altar.AncientPedestal; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.ItemEntityMock; -import be.seeseemelk.mockbukkit.inventory.HopperInventoryMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.ItemMock; +import org.mockbukkit.mockbukkit.inventory.HopperInventoryMock; class TestItemPickupListener { @@ -48,7 +48,7 @@ public static void unload() { @ValueSource(booleans = { true, false }) void testNoPickupFlagForEntities(boolean flag) { Player player = server.addPlayer(); - Item item = new ItemEntityMock(server, UUID.randomUUID(), new ItemStack(Material.COMPASS)); + Item item = new ItemMock(server, UUID.randomUUID(), new ItemStack(Material.COMPASS)); if (flag) { SlimefunUtils.markAsNoPickup(item, "Unit Test"); @@ -64,7 +64,7 @@ void testNoPickupFlagForEntities(boolean flag) { @ValueSource(booleans = { true, false }) void testNoPickupFlagForInventories(boolean flag) { Inventory inventory = new HopperInventoryMock(null); - Item item = new ItemEntityMock(server, UUID.randomUUID(), new ItemStack(Material.COMPASS)); + Item item = new ItemMock(server, UUID.randomUUID(), new ItemStack(Material.COMPASS)); if (flag) { SlimefunUtils.markAsNoPickup(item, "Unit Test"); @@ -89,7 +89,7 @@ void testAltarProbeForEntities(boolean flag) { } AtomicBoolean removed = new AtomicBoolean(false); - Item item = new ItemEntityMock(server, UUID.randomUUID(), stack) { + Item item = new ItemMock(server, UUID.randomUUID(), stack) { @Override public void remove() { @@ -117,7 +117,7 @@ void testAltarProbeForInventories(boolean flag) { } AtomicBoolean removed = new AtomicBoolean(false); - Item item = new ItemEntityMock(server, UUID.randomUUID(), stack) { + Item item = new ItemMock(server, UUID.randomUUID(), stack) { @Override public void remove() { @@ -133,3 +133,4 @@ public void remove() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestMultiblockListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestMultiblockListener.java similarity index 80% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestMultiblockListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestMultiblockListener.java index e0420d1645..616bcb8753 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestMultiblockListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestMultiblockListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.World; @@ -16,14 +16,17 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.MultiBlockInteractEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.events.MultiBlockInteractEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.multiblocks.MultiBlock; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestMultiblockListener { @@ -81,12 +84,13 @@ void testMultiblock() { Assertions.assertEquals(Result.DENY, event.useInteractedBlock()); - server.getPluginManager().assertEventFired(MultiBlockInteractEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(MultiBlockInteractEvent.class, e -> { Assertions.assertEquals(player, e.getPlayer()); Assertions.assertEquals(self, e.getClickedBlock()); Assertions.assertEquals(BlockFace.NORTH, e.getClickedFace()); Assertions.assertEquals(multiblock, e.getMultiBlock()); return true; - }); + })); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestNetworkListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestNetworkListener.java similarity index 86% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestNetworkListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestNetworkListener.java index b6ef3148d6..90179ae5c2 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestNetworkListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestNetworkListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Location; import org.bukkit.Material; @@ -14,12 +14,12 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestNetworkListener { @@ -71,3 +71,4 @@ void testBlockPlace() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPiglinListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPiglinListener.java similarity index 86% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPiglinListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPiglinListener.java index 2c912148cf..dcf7dbb22b 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPiglinListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPiglinListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.UUID; @@ -20,14 +20,14 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.entity.PiglinListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.entity.PiglinListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.ItemEntityMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.ItemMock; class TestPiglinListener { @@ -51,7 +51,7 @@ private EntityPickupItemEvent createPickupEvent(ItemStack item) { Piglin piglin = Mockito.mock(Piglin.class); Mockito.when(piglin.getType()).thenReturn(EntityType.PIGLIN); - Item itemEntity = new ItemEntityMock(server, UUID.randomUUID(), item); + Item itemEntity = new ItemMock(server, UUID.randomUUID(), item); return new EntityPickupItemEvent(piglin, itemEntity, 1); } @@ -109,3 +109,4 @@ void testPiglinInteractWithSlimefunItem(EquipmentSlot hand) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPlayerProfileListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPlayerProfileListener.java similarity index 68% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPlayerProfileListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPlayerProfileListener.java index 0ee300a138..a58bea1426 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestPlayerProfileListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestPlayerProfileListener.java @@ -1,4 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; + +import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerKickEvent; @@ -9,12 +11,12 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestPlayerProfileListener { @@ -39,7 +41,7 @@ public static void unload() { void testPlayerLeave() throws InterruptedException { Player player = server.addPlayer(); PlayerProfile profile = TestUtilities.awaitProfile(player); - PlayerQuitEvent event = new PlayerQuitEvent(player, "bye"); + PlayerQuitEvent event = new PlayerQuitEvent(player, Component.text("bye"), PlayerQuitEvent.QuitReason.DISCONNECTED); listener.onDisconnect(event); Assertions.assertTrue(profile.isMarkedForDeletion()); @@ -49,7 +51,7 @@ void testPlayerLeave() throws InterruptedException { @DisplayName("Test PlayerProfile being unloaded when Player leaves") void testUnloadedPlayerLeave() { Player player = server.addPlayer(); - PlayerQuitEvent event = new PlayerQuitEvent(player, "bye"); + PlayerQuitEvent event = new PlayerQuitEvent(player, Component.text("bye"), PlayerQuitEvent.QuitReason.DISCONNECTED); listener.onDisconnect(event); Assertions.assertFalse(PlayerProfile.find(player).isPresent()); @@ -60,7 +62,7 @@ void testUnloadedPlayerLeave() { void testPlayerKick() throws InterruptedException { Player player = server.addPlayer(); PlayerProfile profile = TestUtilities.awaitProfile(player); - PlayerKickEvent event = new PlayerKickEvent(player, "You're not welcome anymore", "bye"); + PlayerKickEvent event = new PlayerKickEvent(player, Component.text("You're not welcome anymore"), Component.text("bye"), PlayerKickEvent.Cause.PLUGIN); listener.onKick(event); Assertions.assertTrue(profile.isMarkedForDeletion()); @@ -70,10 +72,11 @@ void testPlayerKick() throws InterruptedException { @DisplayName("Test PlayerProfile being unloaded when Player is kicked") void testUnloadedPlayerKick() { Player player = server.addPlayer(); - PlayerKickEvent event = new PlayerKickEvent(player, "You're not welcome anymore", "bye"); + PlayerKickEvent event = new PlayerKickEvent(player, Component.text("You're not welcome anymore"), Component.text("bye"), PlayerKickEvent.Cause.PLUGIN); listener.onKick(event); Assertions.assertFalse(PlayerProfile.find(player).isPresent()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunGuideListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunGuideListener.java similarity index 79% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunGuideListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunGuideListener.java index 6b58f849b7..6b8b63b881 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunGuideListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunGuideListener.java @@ -1,7 +1,9 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import java.util.stream.Stream; +import net.kyori.adventure.text.Component; + import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.ItemStack; @@ -13,13 +15,13 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuide; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestSlimefunGuideListener { @@ -48,7 +50,7 @@ void testFirstJoin(boolean hasPlayedBefore, boolean giveSlimefunGuide) { server.getPlayerList().setLastSeen(player.getUniqueId(), System.currentTimeMillis()); } - PlayerJoinEvent event = new PlayerJoinEvent(player, "CanIHazGuide has joined and wants sum guide"); + PlayerJoinEvent event = new PlayerJoinEvent(player, Component.text("CanIHazGuide has joined and wants sum guide")); listener.onJoin(event); ItemStack guide = SlimefunGuide.getItem(SlimefunGuide.getDefaultMode()); @@ -71,3 +73,4 @@ private static Stream cartesianBooleans() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunItemInteractListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunItemInteractListener.java similarity index 78% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunItemInteractListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunItemInteractListener.java index cc33e3750a..9705c05638 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSlimefunItemInteractListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSlimefunItemInteractListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.World; import org.bukkit.block.Block; @@ -17,22 +17,26 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.common.ChatColors; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockBreakEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.EnergyConnector; -import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricFurnace; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves.WindStaff; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunBlockBreakEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.EnergyConnector; +import io.github.thebusybiscuit.slimefun5.implementation.items.electric.machines.ElectricFurnace; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.staves.WindStaff; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestSlimefunItemInteractListener { @@ -100,17 +104,17 @@ void testCannotOpenInvOfBrokenBlock() { ); server.getPluginManager().callEvent(playerInteractEvent); - server.getPluginManager().assertEventFired(PlayerInteractEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerInteractEvent.class, e -> { // We cancel the event on inventory open Assertions.assertSame(e.useInteractedBlock(), Result.DENY); return true; - }); + })); // Assert our right click event fired and the block usage was not denied - server.getPluginManager().assertEventFired(PlayerRightClickEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerRightClickEvent.class, e -> { Assertions.assertNotSame(e.useBlock(), Result.DENY); return true; - }); + })); // Assert we do have an inventory which would be opened // TODO: Create an event for open inventory so this isn't guess work @@ -123,10 +127,10 @@ void testCannotOpenInvOfBrokenBlock() { // Break the block BlockBreakEvent blockBreakEvent = new BlockBreakEvent(block, player); server.getPluginManager().callEvent(blockBreakEvent); - server.getPluginManager().assertEventFired(SlimefunBlockBreakEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockBreakEvent.class, e -> { Assertions.assertEquals(electricFurnace.getId(), e.getSlimefunItem().getId()); return true; - }); + })); // Assert the block is queued for removal Assertions.assertTrue(Slimefun.getTickerTask().isDeletedSoon(block.getLocation())); @@ -143,17 +147,14 @@ void testCannotOpenInvOfBrokenBlock() { ); server.getPluginManager().callEvent(secondPlayerInteractEvent); - server.getPluginManager().assertEventFired(PlayerInteractEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerInteractEvent.class, e -> { // We cancelled the event due to the block being removed Assertions.assertSame(e.useInteractedBlock(), Result.DENY); return true; - }); + })); // Assert our right click event was not fired due to the block being broken - Assertions.assertThrows( - AssertionError.class, - () -> server.getPluginManager().assertEventFired(PlayerRightClickEvent.class, e -> true) - ); + assertThat(server.getPluginManager(), not(hasFiredFilteredEvent(PlayerRightClickEvent.class, e -> true))); } @Test @@ -171,17 +172,17 @@ void testRightClickItem() { ); server.getPluginManager().callEvent(playerInteractEvent); - server.getPluginManager().assertEventFired(PlayerInteractEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerInteractEvent.class, e -> { // Assert our interaction was not cancelled Assertions.assertNotSame(e.useItemInHand(), Result.DENY); return true; - }); + })); // Assert our right click event fired and the item usage was not denied - server.getPluginManager().assertEventFired(PlayerRightClickEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerRightClickEvent.class, e -> { Assertions.assertNotSame(e.useItem(), Result.DENY); return true; - }); + })); // Assert our food level is now 18 Assertions.assertEquals(18, player.getFoodLevel()); @@ -204,19 +205,20 @@ void testRightClickInteractableBlock() { ); server.getPluginManager().callEvent(playerInteractEvent); - server.getPluginManager().assertEventFired(PlayerInteractEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerInteractEvent.class, e -> { // Allow interaction of the block Assertions.assertSame(e.useInteractedBlock(), Result.ALLOW); return true; - }); + })); // Assert our right click event fired and the block usage was not denied - server.getPluginManager().assertEventFired(PlayerRightClickEvent.class, e -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerRightClickEvent.class, e -> { Assertions.assertNotSame(e.useBlock(), Result.DENY); return true; - }); + })); // Assert the message our energy connector sends Assertions.assertEquals(ChatColors.color("&7Connected: " + "&4\u2718"), player.nextMessage()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSmithingTableListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSmithingTableListener.java similarity index 93% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSmithingTableListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSmithingTableListener.java index 4c02f5864b..f09b3fc677 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSmithingTableListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSmithingTableListener.java @@ -1,7 +1,7 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; import org.apache.commons.lang3.mutable.MutableObject; import org.bukkit.Material; @@ -23,11 +23,11 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.listeners.crafting.SmithingTableListener; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.listeners.crafting.SmithingTableListener; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; class TestSmithingTableListener { @@ -70,6 +70,8 @@ private SmithItemEvent mockSmithingEvent(ItemStack tool, ItemStack material) { Player player = server.addPlayer(); SmithingInventory inv = Mockito.mock(SmithingInventory.class); + Mockito.when(inv.getType()).thenReturn(org.bukkit.event.inventory.InventoryType.SMITHING); + Mockito.when(inv.getSize()).thenReturn(4); // MinecraftVersion#isAtLeast always returns true during unit test, so we use the 1.20 layout here. Mockito.when(inv.getContents()).thenReturn(new ItemStack[] { new ItemStack(Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE), tool, material, null }); @@ -84,6 +86,8 @@ private PrepareSmithingEvent mockPrepareSmithingEvent(ItemStack tool, ItemStack Player player = server.addPlayer(); SmithingInventory inv = Mockito.mock(SmithingInventory.class); + Mockito.when(inv.getType()).thenReturn(org.bukkit.event.inventory.InventoryType.SMITHING); + Mockito.when(inv.getSize()).thenReturn(4); MutableObject result = new MutableObject<>(new ItemStack(Material.NETHERITE_PICKAXE)); Mockito.doAnswer(invocation -> { @@ -245,3 +249,4 @@ void testPrepareCanBeUsedInWorkbenchTrue() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSoulboundListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSoulboundListener.java similarity index 73% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSoulboundListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSoulboundListener.java index cfe65281ed..54488bfe45 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestSoulboundListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestSoulboundListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.event.entity.EntityDeathEvent; @@ -11,16 +11,19 @@ import org.junit.jupiter.params.provider.ValueSource; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.magical.SoulboundItem; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.magical.SoulboundItem; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.SlimefunUtils; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.entity.PlayerMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.entity.PlayerMock; class TestSoulboundListener { @@ -49,9 +52,9 @@ void testItemDrop(boolean soulbound) { player.getInventory().setItem(6, item); player.setHealth(0); - server.getPluginManager().assertEventFired(EntityDeathEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(EntityDeathEvent.class, event -> { return soulbound != event.getDrops().contains(item); - }); + })); } @ParameterizedTest @@ -71,10 +74,10 @@ void testItemDropIfItemDisabled(boolean enabled) { player.getInventory().setItem(0, item.item()); player.setHealth(0); - server.getPluginManager().assertEventFired(EntityDeathEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(EntityDeathEvent.class, event -> { // If the item is enabled, we don't want it to drop. return enabled == !event.getDrops().contains(item.item()); - }); + })); Slimefun.getRegistry().getEnabledSlimefunItems().remove(soulboundItem); } @@ -89,10 +92,11 @@ void testItemRecover(boolean soulbound) { player.setHealth(0); player.respawn(); - server.getPluginManager().assertEventFired(PlayerRespawnEvent.class, event -> { + assertThat(server.getPluginManager(), hasFiredFilteredEvent(PlayerRespawnEvent.class, event -> { ItemStack stack = player.getInventory().getItem(6); return SlimefunUtils.isItemSimilar(stack, item, true) == soulbound; - }); + })); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestVillagerTradingListener.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestVillagerTradingListener.java similarity index 82% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestVillagerTradingListener.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestVillagerTradingListener.java index 4dc145ba9c..0ae7d09760 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TestVillagerTradingListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/listeners/TestVillagerTradingListener.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.listeners; +package io.github.thebusybiscuit.slimefun5.implementation.listeners; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -18,17 +18,17 @@ import org.mockito.Mockito; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.misc.SyntheticEmerald; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.misc.SyntheticEmerald; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestVillagerTradingListener { @@ -95,3 +95,4 @@ void testTradingWithSyntheticEmerald() { Assertions.assertEquals(Result.ALLOW, event.getResult()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemGroups.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemGroups.java similarity index 91% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemGroups.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemGroups.java index bdaa4a1d25..b7c6c8f4bf 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemGroups.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemGroups.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.registration; +package io.github.thebusybiscuit.slimefun5.implementation.registration; import java.time.LocalDate; import java.time.Month; @@ -14,21 +14,21 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.LockedItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.groups.SeasonalItemGroup; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; - -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.LockedItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.groups.SeasonalItemGroup; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.core.guide.SlimefunGuideMode; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestItemGroups { @@ -233,3 +233,4 @@ public boolean isVisible(Player p, PlayerProfile profile, SlimefunGuideMode layo Assertions.assertThrows(UnsupportedOperationException.class, () -> group.getItems()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemHandlers.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemHandlers.java similarity index 83% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemHandlers.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemHandlers.java index 945c1082aa..c52553f30f 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemHandlers.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestItemHandlers.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.registration; +package io.github.thebusybiscuit.slimefun5.implementation.registration; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; @@ -11,15 +11,15 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IncompatibleItemHandlerException; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.BowShootHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockItemHandler; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IncompatibleItemHandlerException; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.BowShootHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockItemHandler; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestItemHandlers { @@ -82,3 +82,4 @@ void testBowShootHandler() { Assertions.assertFalse(exception2.isPresent()); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRechargeableItems.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRechargeableItems.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRechargeableItems.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRechargeableItems.java index 9dbde56faf..1d6d8370d2 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRechargeableItems.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRechargeableItems.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.registration; +package io.github.thebusybiscuit.slimefun5.implementation.registration; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -9,16 +9,16 @@ import io.github.bakedlibs.dough.common.ChatColors; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Rechargeable; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.LoreBuilder; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestRechargeableItems { @@ -140,3 +140,4 @@ public float getMaxItemCharge(ItemStack item) { } } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRegistration.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRegistration.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRegistration.java index 8364ca3409..6c305d9b15 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestRegistration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.registration; +package io.github.thebusybiscuit.slimefun5.implementation.registration; import java.io.BufferedReader; import java.io.IOException; @@ -22,17 +22,17 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.groups.FlexItemGroup; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.setup.PostSetup; -import io.github.thebusybiscuit.slimefun4.implementation.setup.ResearchSetup; -import io.github.thebusybiscuit.slimefun4.implementation.setup.SlimefunItemSetup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.groups.FlexItemGroup; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.setup.PostSetup; +import io.github.thebusybiscuit.slimefun5.implementation.setup.ResearchSetup; +import io.github.thebusybiscuit.slimefun5.implementation.setup.SlimefunItemSetup; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; @TestMethodOrder(value = OrderAnnotation.class) class TestRegistration { @@ -148,3 +148,4 @@ void testForEmptyResearches(@Nonnull Research research) throws IOException { return Slimefun.getRegistry().getResearches().stream().map(Arguments::of); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestSlimefunItemRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestSlimefunItemRegistration.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestSlimefunItemRegistration.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestSlimefunItemRegistration.java index 577bbd0318..dd319312b5 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestSlimefunItemRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/registration/TestSlimefunItemRegistration.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.registration; +package io.github.thebusybiscuit.slimefun5.implementation.registration; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -9,15 +9,15 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.exceptions.IdConflictException; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.api.exceptions.IdConflictException; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.ItemState; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestSlimefunItemRegistration { @@ -138,3 +138,4 @@ void testHiddenItem() { Assertions.assertFalse(itemGroup.contains(item)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TestArmorTask.java similarity index 85% rename from src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TestArmorTask.java index 2d53c865fa..d1d024b140 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/implementation/tasks/TestArmorTask.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.implementation.tasks; +package io.github.thebusybiscuit.slimefun5.implementation.tasks; import java.util.Arrays; import java.util.Locale; @@ -18,18 +18,18 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactivity; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.RadioactiveItem; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockHazmatSuit; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Radioactivity; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.RadioactiveItem; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockHazmatSuit; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; class TestArmorTask { @@ -116,3 +116,4 @@ private static Stream cartesianBooleans() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/storage/backend/TestLegacyBackend.java b/src/test/java/io/github/thebusybiscuit/slimefun5/storage/backend/TestLegacyBackend.java similarity index 96% rename from src/test/java/io/github/thebusybiscuit/slimefun4/storage/backend/TestLegacyBackend.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/storage/backend/TestLegacyBackend.java index 6fa492b7a0..4d1a097d9b 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/storage/backend/TestLegacyBackend.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/storage/backend/TestLegacyBackend.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.storage.backend; +package io.github.thebusybiscuit.slimefun5.storage.backend; import java.io.File; import java.io.IOException; @@ -22,16 +22,16 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import io.github.thebusybiscuit.slimefun4.api.gps.Waypoint; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.researches.Research; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.storage.backend.legacy.LegacyStorage; -import io.github.thebusybiscuit.slimefun4.storage.data.PlayerData; -import io.github.thebusybiscuit.slimefun4.test.TestUtilities; -import io.github.thebusybiscuit.slimefun4.utils.FileUtils; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import io.github.thebusybiscuit.slimefun5.api.gps.Waypoint; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.researches.Research; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.storage.backend.legacy.LegacyStorage; +import io.github.thebusybiscuit.slimefun5.storage.data.PlayerData; +import io.github.thebusybiscuit.slimefun5.test.TestUtilities; +import io.github.thebusybiscuit.slimefun5.utils.FileUtils; class TestLegacyBackend { @@ -426,3 +426,4 @@ private static void setupResearches() { } } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/TestUtilities.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/TestUtilities.java similarity index 81% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/TestUtilities.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/TestUtilities.java index a46d933d54..e12ad5c347 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/TestUtilities.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/TestUtilities.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test; +package io.github.thebusybiscuit.slimefun5.test; import static org.mockito.Mockito.when; @@ -26,17 +26,20 @@ import org.junit.jupiter.api.Assertions; import org.mockito.Mockito; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.block.BlockMock; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventFilterMatcher.hasFiredFilteredEvent; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockPlaceEvent; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem; -import io.github.thebusybiscuit.slimefun4.test.mocks.MockSlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.events.SlimefunBlockPlaceEvent; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.items.VanillaItem; +import io.github.thebusybiscuit.slimefun5.test.mocks.MockSlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; public final class TestUtilities { @@ -117,8 +120,9 @@ public static Block placeSlimefunBlock(ServerMock server, ItemStack item, World ); server.getPluginManager().callEvent(blockPlaceEvent); - server.getPluginManager().assertEventFired(SlimefunBlockPlaceEvent.class, e -> true); + assertThat(server.getPluginManager(), hasFiredFilteredEvent(SlimefunBlockPlaceEvent.class, e -> true)); return block; } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/InventoryViewWrapper.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/InventoryViewWrapper.java similarity index 85% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/InventoryViewWrapper.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/InventoryViewWrapper.java index 0b49c5ed0b..4adb0ddd21 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/InventoryViewWrapper.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/InventoryViewWrapper.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; -import be.seeseemelk.mockbukkit.inventory.InventoryViewMock; +import org.mockbukkit.mockbukkit.inventory.InventoryViewMock; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; @@ -25,21 +25,19 @@ public class InventoryViewWrapper extends InventoryViewMock { private InventoryViewWrapper(HumanEntity player, - String name, Inventory top, Inventory bottom, InventoryType type) { - super(player, name, top, bottom, type); + super(player, top, bottom, type); } @Nonnull public static InventoryViewWrapper wrap(@Nonnull InventoryView inventoryView) { HumanEntity player = inventoryView.getPlayer(); - String name = inventoryView.getTitle(); Inventory top = inventoryView.getTopInventory(); Inventory bottom = inventoryView.getBottomInventory(); InventoryType inventoryType = inventoryView.getType(); - return new InventoryViewWrapper(player, name, top, bottom, inventoryType); + return new InventoryViewWrapper(player, top, bottom, inventoryType); } @Override @@ -57,3 +55,4 @@ public void setItem(int slot, @Nullable ItemStack item) { } } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockDamageable.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockDamageable.java similarity index 69% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockDamageable.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockDamageable.java index 9f52e8ffe0..0b020d881e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockDamageable.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockDamageable.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -7,11 +7,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.DamageableItem; public class MockDamageable extends SlimefunItem implements DamageableItem { @@ -33,3 +33,4 @@ public void damageItem(@Nonnull Player p, @Nullable ItemStack item) { DamageableItem.super.damageItem(p, item); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockHazmatSuit.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockHazmatSuit.java similarity index 66% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockHazmatSuit.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockHazmatSuit.java index 93501cbc81..3601b3c031 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockHazmatSuit.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockHazmatSuit.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; import javax.annotation.ParametersAreNonnullByDefault; @@ -6,12 +6,12 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType; -import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectiveArmor; -import io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectionType; +import io.github.thebusybiscuit.slimefun5.core.attributes.ProtectiveArmor; +import io.github.thebusybiscuit.slimefun5.implementation.items.armor.SlimefunArmorPiece; public class MockHazmatSuit extends SlimefunArmorPiece implements ProtectiveArmor { @@ -36,3 +36,4 @@ public NamespacedKey getArmorSetId() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockItemHandler.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockItemHandler.java similarity index 58% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockItemHandler.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockItemHandler.java index fef1189327..6be319c4b8 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockItemHandler.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockItemHandler.java @@ -1,6 +1,6 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; -import io.github.thebusybiscuit.slimefun4.api.items.ItemHandler; +import io.github.thebusybiscuit.slimefun5.api.items.ItemHandler; public class MockItemHandler implements ItemHandler { @@ -10,3 +10,4 @@ public Class getIdentifier() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockNetwork.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockNetwork.java similarity index 79% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockNetwork.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockNetwork.java index 7a47b92c3c..0271ff733e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockNetwork.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockNetwork.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; import java.util.Map; @@ -6,9 +6,9 @@ import org.bukkit.Location; -import io.github.thebusybiscuit.slimefun4.api.network.Network; -import io.github.thebusybiscuit.slimefun4.api.network.NetworkComponent; -import io.github.thebusybiscuit.slimefun4.core.networks.NetworkManager; +import io.github.thebusybiscuit.slimefun5.api.network.Network; +import io.github.thebusybiscuit.slimefun5.api.network.NetworkComponent; +import io.github.thebusybiscuit.slimefun5.core.networks.NetworkManager; public class MockNetwork extends Network { @@ -41,4 +41,4 @@ public void onClassificationChange(Location l, NetworkComponent from, NetworkCom // Do nothing } -} \ No newline at end of file +} diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockProfile.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockProfile.java similarity index 69% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockProfile.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockProfile.java index 9a7837d00a..5430f9b017 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/mocks/MockProfile.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockProfile.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.mocks; +package io.github.thebusybiscuit.slimefun5.test.mocks; import java.util.HashMap; import java.util.Set; @@ -7,8 +7,8 @@ import org.bukkit.OfflinePlayer; -import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile; -import io.github.thebusybiscuit.slimefun4.storage.data.PlayerData; +import io.github.thebusybiscuit.slimefun5.api.player.PlayerProfile; +import io.github.thebusybiscuit.slimefun5.storage.data.PlayerData; public class MockProfile extends PlayerProfile { @@ -20,3 +20,4 @@ public MockProfile(@Nonnull OfflinePlayer p, @Nonnull PlayerData data) { super(p, data); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockSlimefunItem.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockSlimefunItem.java new file mode 100644 index 0000000000..970172d82f --- /dev/null +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/mocks/MockSlimefunItem.java @@ -0,0 +1,17 @@ +package io.github.thebusybiscuit.slimefun5.test.mocks; + +import org.bukkit.inventory.ItemStack; + +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; + +public class MockSlimefunItem extends SlimefunItem { + + public MockSlimefunItem(ItemGroup itemGroup, ItemStack item, String id) { + super(itemGroup, new SlimefunItemStack(id, item), RecipeType.NULL, new ItemStack[9]); + } + +} + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/presets/SlimefunItemTest.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/presets/SlimefunItemTest.java similarity index 82% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/presets/SlimefunItemTest.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/presets/SlimefunItemTest.java index 36218a9506..5163d7c059 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/presets/SlimefunItemTest.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/presets/SlimefunItemTest.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.presets; +package io.github.thebusybiscuit.slimefun5.test.presets; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,13 +10,13 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemConsumptionHandler; -import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.events.PlayerRightClickEvent; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemConsumptionHandler; +import io.github.thebusybiscuit.slimefun5.core.handlers.ItemUseHandler; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.block.BlockMock; +import org.mockbukkit.mockbukkit.block.BlockMock; /** * This is a convenient interface for us to use in unit test classes @@ -59,8 +59,9 @@ default void simulateRightClickBlock(Player player, T item, ItemStack heldItem, @ParametersAreNonnullByDefault default void simulateConsumption(Player player, T item) { - PlayerItemConsumeEvent event = new PlayerItemConsumeEvent(player, item.getItem().clone()); + PlayerItemConsumeEvent event = new PlayerItemConsumeEvent(player, item.getItem().clone(), EquipmentSlot.HAND); item.callItemHandler(ItemConsumptionHandler.class, handler -> handler.onConsume(event, player, event.getItem())); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeyProvider.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeyProvider.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeyProvider.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeyProvider.java index de79406900..e629dd04ae 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeyProvider.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeyProvider.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.providers; +package io.github.thebusybiscuit.slimefun5.test.providers; import java.util.Arrays; import java.util.stream.Stream; @@ -30,3 +30,4 @@ public Stream provideArguments(ExtensionContext context) th return Arrays.stream(keys).map(key -> new NamespacedKey(plugin, key)).map(Arguments::of); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeySource.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeySource.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeySource.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeySource.java index 6fc55ef25b..63c20ee283 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/NamespacedKeySource.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/NamespacedKeySource.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.providers; +package io.github.thebusybiscuit.slimefun5.test.providers; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -19,3 +19,4 @@ String[] keys(); } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsProvider.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsProvider.java similarity index 84% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsProvider.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsProvider.java index 3b084dcf3a..e525de98d4 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsProvider.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsProvider.java @@ -1,18 +1,18 @@ -package io.github.thebusybiscuit.slimefun4.test.providers; +package io.github.thebusybiscuit.slimefun5.test.providers; import java.lang.reflect.Field; import java.util.Arrays; import java.util.stream.Stream; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; import org.bukkit.inventory.ItemStack; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.support.AnnotationConsumer; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun5.implementation.SlimefunItems; public class SlimefunItemsProvider implements ArgumentsProvider, AnnotationConsumer { @@ -41,3 +41,4 @@ private ItemStack getAsItemStack(String fieldName) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsSource.java b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsSource.java similarity index 88% rename from src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsSource.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsSource.java index 5df89dc5e8..09831f8516 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/test/providers/SlimefunItemsSource.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/test/providers/SlimefunItemsSource.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.test.providers; +package io.github.thebusybiscuit.slimefun5.test.providers; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -17,3 +17,4 @@ String[] items(); } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChargeUtils.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChargeUtils.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChargeUtils.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChargeUtils.java index 1f91b38415..df4166a925 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChargeUtils.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChargeUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Collections; @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestChargeUtils { @@ -89,3 +89,4 @@ void testGetCharge() { Assertions.assertThrows(IllegalArgumentException.class, () -> ChargeUtils.getCharge(null)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChatUtils.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChatUtils.java similarity index 96% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChatUtils.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChatUtils.java index 794b02e4b5..46c85a00a2 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestChatUtils.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestChatUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import org.bukkit.ChatColor; import org.junit.jupiter.api.Assertions; @@ -44,3 +44,4 @@ void testPluralization() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestFireworkUtils.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestFireworkUtils.java similarity index 91% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestFireworkUtils.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestFireworkUtils.java index a32183d663..559bcb3f66 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestFireworkUtils.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestFireworkUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.List; import java.util.stream.Stream; @@ -17,8 +17,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.WorldMock; +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.world.WorldMock; class TestFireworkUtils { @@ -55,3 +55,4 @@ private static Stream getColors() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestHeadTextures.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestHeadTextures.java similarity index 92% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestHeadTextures.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestHeadTextures.java index 162b951d6c..3a380134dd 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestHeadTextures.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestHeadTextures.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.HashSet; import java.util.Set; @@ -24,3 +24,4 @@ void testForDuplicates() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestInfiniteBlockGenerators.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestInfiniteBlockGenerators.java similarity index 89% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestInfiniteBlockGenerators.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestInfiniteBlockGenerators.java index 5d0d2fec68..3e29dcc0da 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestInfiniteBlockGenerators.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestInfiniteBlockGenerators.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Arrays; import java.util.stream.Stream; @@ -18,11 +18,14 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; -import be.seeseemelk.mockbukkit.ServerMock; -import be.seeseemelk.mockbukkit.WorldMock; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockbukkit.mockbukkit.matcher.plugin.PluginManagerFiredEventClassMatcher.hasFiredEventInstance; + +import org.mockbukkit.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.ServerMock; +import org.mockbukkit.mockbukkit.world.WorldMock; class TestInfiniteBlockGenerators { @@ -70,7 +73,7 @@ void testValidCobblestoneGenerator(BlockFace water, BlockFace lava) { Assertions.assertTrue(generator.test(block)); Assertions.assertNotNull(generator.callEvent(block)); - server.getPluginManager().assertEventFired(BlockFormEvent.class); + assertThat(server.getPluginManager(), hasFiredEventInstance(BlockFormEvent.class)); server.getPluginManager().clearEvents(); Assertions.assertEquals(generator, InfiniteBlockGenerator.findAt(block)); @@ -112,7 +115,7 @@ void testValidBasaltGenerator(BlockFace ice, BlockFace lava) { Assertions.assertTrue(generator.test(block)); Assertions.assertNotNull(generator.callEvent(block)); - server.getPluginManager().assertEventFired(BlockFormEvent.class); + assertThat(server.getPluginManager(), hasFiredEventInstance(BlockFormEvent.class)); server.getPluginManager().clearEvents(); Assertions.assertEquals(generator, InfiniteBlockGenerator.findAt(block)); @@ -153,7 +156,7 @@ void testValidStoneGenerator(BlockFace water) { Assertions.assertTrue(generator.test(block)); Assertions.assertNotNull(generator.callEvent(block)); - server.getPluginManager().assertEventFired(BlockFormEvent.class); + assertThat(server.getPluginManager(), hasFiredEventInstance(BlockFormEvent.class)); server.getPluginManager().clearEvents(); Assertions.assertEquals(generator, InfiniteBlockGenerator.findAt(block)); @@ -165,3 +168,4 @@ private static Stream provideFaces() { return stream.flatMap(a -> Arrays.stream(faces).filter(b -> a != b).map(b -> Arguments.of(a, b))); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestItemStackWrapper.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestItemStackWrapper.java similarity index 96% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestItemStackWrapper.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestItemStackWrapper.java index 76aaa5b944..09d07f3866 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestItemStackWrapper.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestItemStackWrapper.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Arrays; import java.util.List; @@ -14,10 +14,10 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.itemstack.ItemStackWrapper; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestItemStackWrapper { @@ -139,3 +139,4 @@ private void assertWrapped(@Nullable ItemStack expected, @Nullable ItemStack act } } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestLoreComparison.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestLoreComparison.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestLoreComparison.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestLoreComparison.java index 7441f22502..afa315c9d1 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestLoreComparison.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestLoreComparison.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.util.Arrays; import java.util.List; @@ -10,9 +10,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestLoreComparison { @@ -110,3 +110,4 @@ void testIgnoredElementsNotEqualLists() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestMinecraftVersion.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestMinecraftVersion.java similarity index 75% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestMinecraftVersion.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestMinecraftVersion.java index 74a2622cce..dcbb138494 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestMinecraftVersion.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestMinecraftVersion.java @@ -1,10 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; class TestMinecraftVersion { @@ -14,10 +14,12 @@ void testMatches() { Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_16.isMinecraftVersion(16, -1)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_17.isMinecraftVersion(17, -1)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20_5.isMinecraftVersion(20, 5)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 4)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_17.isMinecraftVersion(16, -1)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_16.isMinecraftVersion(0, -1)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_20_5.isMinecraftVersion(20, 4)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 3)); } @Test @@ -29,6 +31,17 @@ void testMatchesMinor() { Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20.isMinecraftVersion(20, 4)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20_5.isMinecraftVersion(20, 6)); + // 1.21.x covers 1.21.0 through 1.21.3 + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21.isMinecraftVersion(21, 0)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21.isMinecraftVersion(21, 3)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21.isMinecraftVersion(21, 4)); + + // 1.21.4+ covers 1.21.4 and above + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 4)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 5)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 11)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21_4.isMinecraftVersion(21, 3)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_20.isMinecraftVersion(20, 5)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_16.isMinecraftVersion(17, 1)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_20_5.isMinecraftVersion(20, 4)); @@ -42,8 +55,11 @@ void testAtLeast() { Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_17.isAtLeast(MinecraftVersion.MINECRAFT_1_17)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20.isAtLeast(MinecraftVersion.MINECRAFT_1_20)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20_5.isAtLeast(MinecraftVersion.MINECRAFT_1_20)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isAtLeast(MinecraftVersion.MINECRAFT_1_21)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isAtLeast(MinecraftVersion.MINECRAFT_1_21_4)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_17.isAtLeast(MinecraftVersion.MINECRAFT_1_18)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21.isAtLeast(MinecraftVersion.MINECRAFT_1_21_4)); } @Test @@ -82,6 +98,11 @@ void testIsBeforeMinor() { Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_20_5.isBefore(20, 4)); Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_20_5.isBefore(20, 5)); Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_20_5.isBefore(20, 6)); + + // 1.21.4+ version boundary tests + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21_4.isBefore(21, 3)); + Assertions.assertFalse(MinecraftVersion.MINECRAFT_1_21_4.isBefore(21, 4)); + Assertions.assertTrue(MinecraftVersion.MINECRAFT_1_21_4.isBefore(21, 5)); } @Test @@ -101,3 +122,4 @@ void testLowestSupportedVersion() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestNumberUtils.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestNumberUtils.java similarity index 99% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestNumberUtils.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestNumberUtils.java index cb6d40a236..ff1c5a34da 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestNumberUtils.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestNumberUtils.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.time.LocalDateTime; @@ -117,3 +117,4 @@ void testLimitedAddition() { Assertions.assertEquals(-1000, NumberUtils.limitedAddition(-2, -999, -1000, 1000)); } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestSoulboundItem.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestSoulboundItem.java similarity index 86% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestSoulboundItem.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestSoulboundItem.java index 391fd6c2e0..aa3a56fe86 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestSoulboundItem.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestSoulboundItem.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -10,14 +10,14 @@ import org.junit.jupiter.api.Test; import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun5.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun5.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun5.core.attributes.Soulbound; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestSoulboundItem { @@ -98,3 +98,4 @@ public SoulboundMock(ItemGroup itemGroup) { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestWikiResource.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestWikiResource.java similarity index 96% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestWikiResource.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestWikiResource.java index 1f28718950..aaff0375fb 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/TestWikiResource.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/TestWikiResource.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils; +package io.github.thebusybiscuit.slimefun5.utils; import java.io.BufferedReader; import java.io.IOException; @@ -37,3 +37,4 @@ void testWikiJson() throws IOException { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMap.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMap.java similarity index 94% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMap.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMap.java index 756c5044cf..f7501d90f9 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMap.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMap.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -13,10 +13,10 @@ import com.google.gson.JsonElement; -import io.github.thebusybiscuit.slimefun4.api.exceptions.BiomeMapException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.exceptions.BiomeMapException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestBiomeMap { @@ -113,3 +113,4 @@ void testManualBiomeMap() { } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapCompatibility.java similarity index 90% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapCompatibility.java index d7ffca7d79..afa8fcff0d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapCompatibility.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import java.io.BufferedReader; import java.io.IOException; @@ -25,11 +25,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.utils.JsonUtils; +import io.github.thebusybiscuit.slimefun5.api.MinecraftVersion; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.utils.JsonUtils; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; /** * This test checks if biome maps work across multiple versions of Minecraft. @@ -107,7 +107,8 @@ void testCompatibilities(String name, MinecraftVersion version) { MinecraftVersion.MINECRAFT_1_18, MinecraftVersion.MINECRAFT_1_19, MinecraftVersion.MINECRAFT_1_20, - MinecraftVersion.MINECRAFT_1_21 + MinecraftVersion.MINECRAFT_1_21, + MinecraftVersion.MINECRAFT_1_21_4 }); testCases.put("oil_v1.16", new MinecraftVersion[] { @@ -119,7 +120,8 @@ void testCompatibilities(String name, MinecraftVersion version) { MinecraftVersion.MINECRAFT_1_18, MinecraftVersion.MINECRAFT_1_19, MinecraftVersion.MINECRAFT_1_20, - MinecraftVersion.MINECRAFT_1_21 + MinecraftVersion.MINECRAFT_1_21, + MinecraftVersion.MINECRAFT_1_21_4 }); testCases.put("salt_v1.16", new MinecraftVersion[] { @@ -131,7 +133,8 @@ void testCompatibilities(String name, MinecraftVersion version) { MinecraftVersion.MINECRAFT_1_18, MinecraftVersion.MINECRAFT_1_19, MinecraftVersion.MINECRAFT_1_20, - MinecraftVersion.MINECRAFT_1_21 + MinecraftVersion.MINECRAFT_1_21, + MinecraftVersion.MINECRAFT_1_21_4 }); testCases.put("uranium_v1.16", new MinecraftVersion[] { @@ -146,7 +149,8 @@ void testCompatibilities(String name, MinecraftVersion version) { MinecraftVersion.MINECRAFT_1_18, MinecraftVersion.MINECRAFT_1_19, MinecraftVersion.MINECRAFT_1_20, - MinecraftVersion.MINECRAFT_1_21 + MinecraftVersion.MINECRAFT_1_21, + MinecraftVersion.MINECRAFT_1_21_4 }); // @formatter:on @@ -185,3 +189,4 @@ private void checkBiomes(JsonArray biomes, JsonArray allBiomes, MinecraftVersion } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapParser.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapParser.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapParser.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapParser.java index 0aa6bf9c81..62ecef8312 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapParser.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/biomes/TestBiomeMapParser.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.biomes; +package io.github.thebusybiscuit.slimefun5.utils.biomes; import javax.annotation.ParametersAreNonnullByDefault; @@ -14,10 +14,10 @@ import com.google.gson.JsonElement; -import io.github.thebusybiscuit.slimefun4.api.exceptions.BiomeMapException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.exceptions.BiomeMapException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestBiomeMapParser { @@ -133,3 +133,4 @@ private void assertMisconfiguration(BiomeDataConverter function, String j } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestSlimefunTags.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestSlimefunTags.java similarity index 95% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestSlimefunTags.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestSlimefunTags.java index 0e9fe8e3f6..2dad3bf82e 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestSlimefunTags.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestSlimefunTags.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.tags; +package io.github.thebusybiscuit.slimefun5.utils.tags; import java.util.HashSet; import java.util.Set; @@ -16,10 +16,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestSlimefunTags { @@ -157,3 +157,4 @@ private boolean isCyclic(Set visiting, Set visited, Sl } } + diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestTagParser.java b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestTagParser.java similarity index 93% rename from src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestTagParser.java rename to src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestTagParser.java index 68f3748715..0e86a5181a 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/tags/TestTagParser.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun5/utils/tags/TestTagParser.java @@ -1,4 +1,4 @@ -package io.github.thebusybiscuit.slimefun4.utils.tags; +package io.github.thebusybiscuit.slimefun5.utils.tags; import javax.annotation.Nonnull; @@ -9,10 +9,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import io.github.thebusybiscuit.slimefun4.api.exceptions.TagMisconfigurationException; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun5.api.exceptions.TagMisconfigurationException; +import io.github.thebusybiscuit.slimefun5.implementation.Slimefun; -import be.seeseemelk.mockbukkit.MockBukkit; +import org.mockbukkit.mockbukkit.MockBukkit; class TestTagParser { @@ -104,3 +104,4 @@ private void assertMisconfiguration(@Nonnull String json) { } } + diff --git a/src/test/resources/biomes/1.14.x.json b/src/test/resources/biomes/1.14.x.json index 8ee6093581..0469824124 100644 --- a/src/test/resources/biomes/1.14.x.json +++ b/src/test/resources/biomes/1.14.x.json @@ -16,23 +16,23 @@ "minecraft:mushroom_fields", "minecraft:mushroom_field_shore", "minecraft:beach", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", + , + , + , "minecraft:mountain_edge", "minecraft:jungle", - "minecraft:jungle_hills", + , "minecraft:jungle_edge", "minecraft:deep_ocean", "minecraft:stone_shore", "minecraft:snowy_beach", "minecraft:birch_forest", - "minecraft:birch_forest_hills", + , "minecraft:dark_forest", "minecraft:snowy_taiga", - "minecraft:snowy_taiga_hills", + , "minecraft:giant_tree_taiga", - "minecraft:giant_tree_taiga_hills", + , "minecraft:wooded_mountains", "minecraft:savanna", "minecraft:savanna_plateau", @@ -56,13 +56,13 @@ "minecraft:gravelly_mountains", "minecraft:flower_forest", "minecraft:taiga_mountains", - "minecraft:swamp_hills", + , "minecraft:ice_spikes", "minecraft:modified_jungle", "minecraft:modified_jungle_edge", "minecraft:tall_birch_forest", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", + , + , "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga", "minecraft:giant_spruce_taiga_hills", diff --git a/src/test/resources/biomes/1.15.x.json b/src/test/resources/biomes/1.15.x.json index 8ee6093581..0469824124 100644 --- a/src/test/resources/biomes/1.15.x.json +++ b/src/test/resources/biomes/1.15.x.json @@ -16,23 +16,23 @@ "minecraft:mushroom_fields", "minecraft:mushroom_field_shore", "minecraft:beach", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", + , + , + , "minecraft:mountain_edge", "minecraft:jungle", - "minecraft:jungle_hills", + , "minecraft:jungle_edge", "minecraft:deep_ocean", "minecraft:stone_shore", "minecraft:snowy_beach", "minecraft:birch_forest", - "minecraft:birch_forest_hills", + , "minecraft:dark_forest", "minecraft:snowy_taiga", - "minecraft:snowy_taiga_hills", + , "minecraft:giant_tree_taiga", - "minecraft:giant_tree_taiga_hills", + , "minecraft:wooded_mountains", "minecraft:savanna", "minecraft:savanna_plateau", @@ -56,13 +56,13 @@ "minecraft:gravelly_mountains", "minecraft:flower_forest", "minecraft:taiga_mountains", - "minecraft:swamp_hills", + , "minecraft:ice_spikes", "minecraft:modified_jungle", "minecraft:modified_jungle_edge", "minecraft:tall_birch_forest", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", + , + , "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga", "minecraft:giant_spruce_taiga_hills", diff --git a/src/test/resources/biomes/1.16.x.json b/src/test/resources/biomes/1.16.x.json index 5a9050dafe..ba3df741c2 100644 --- a/src/test/resources/biomes/1.16.x.json +++ b/src/test/resources/biomes/1.16.x.json @@ -16,23 +16,23 @@ "minecraft:mushroom_fields", "minecraft:mushroom_field_shore", "minecraft:beach", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", + , + , + , "minecraft:mountain_edge", "minecraft:jungle", - "minecraft:jungle_hills", + , "minecraft:jungle_edge", "minecraft:deep_ocean", "minecraft:stone_shore", "minecraft:snowy_beach", "minecraft:birch_forest", - "minecraft:birch_forest_hills", + , "minecraft:dark_forest", "minecraft:snowy_taiga", - "minecraft:snowy_taiga_hills", + , "minecraft:giant_tree_taiga", - "minecraft:giant_tree_taiga_hills", + , "minecraft:wooded_mountains", "minecraft:savanna", "minecraft:savanna_plateau", @@ -56,13 +56,13 @@ "minecraft:gravelly_mountains", "minecraft:flower_forest", "minecraft:taiga_mountains", - "minecraft:swamp_hills", + , "minecraft:ice_spikes", "minecraft:modified_jungle", "minecraft:modified_jungle_edge", "minecraft:tall_birch_forest", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", + , + , "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga", "minecraft:giant_spruce_taiga_hills", diff --git a/src/test/resources/biomes/1.17.x.json b/src/test/resources/biomes/1.17.x.json index 8797f76d58..6bac163e06 100644 --- a/src/test/resources/biomes/1.17.x.json +++ b/src/test/resources/biomes/1.17.x.json @@ -16,23 +16,23 @@ "minecraft:mushroom_fields", "minecraft:mushroom_field_shore", "minecraft:beach", - "minecraft:desert_hills", - "minecraft:wooded_hills", - "minecraft:taiga_hills", + , + , + , "minecraft:mountain_edge", "minecraft:jungle", - "minecraft:jungle_hills", + , "minecraft:jungle_edge", "minecraft:deep_ocean", "minecraft:stone_shore", "minecraft:snowy_beach", "minecraft:birch_forest", - "minecraft:birch_forest_hills", + , "minecraft:dark_forest", "minecraft:snowy_taiga", - "minecraft:snowy_taiga_hills", + , "minecraft:giant_tree_taiga", - "minecraft:giant_tree_taiga_hills", + , "minecraft:wooded_mountains", "minecraft:savanna", "minecraft:savanna_plateau", @@ -56,13 +56,13 @@ "minecraft:gravelly_mountains", "minecraft:flower_forest", "minecraft:taiga_mountains", - "minecraft:swamp_hills", + , "minecraft:ice_spikes", "minecraft:modified_jungle", "minecraft:modified_jungle_edge", "minecraft:tall_birch_forest", - "minecraft:tall_birch_hills", - "minecraft:dark_forest_hills", + , + , "minecraft:snowy_taiga_mountains", "minecraft:giant_spruce_taiga", "minecraft:giant_spruce_taiga_hills", diff --git a/src/test/resources/biomes/1.21.4+.json b/src/test/resources/biomes/1.21.4+.json new file mode 100644 index 0000000000..643e7e18ea --- /dev/null +++ b/src/test/resources/biomes/1.21.4+.json @@ -0,0 +1,68 @@ +[ + "minecraft:badlands", + "minecraft:bamboo_jungle", + "minecraft:basalt_deltas", + "minecraft:beach", + "minecraft:birch_forest", + "minecraft:cherry_grove", + "minecraft:cold_ocean", + "minecraft:crimson_forest", + "minecraft:custom", + "minecraft:dark_forest", + "minecraft:deep_cold_ocean", + "minecraft:deep_dark", + "minecraft:deep_frozen_ocean", + "minecraft:deep_lukewarm_ocean", + "minecraft:deep_ocean", + "minecraft:desert", + "minecraft:dripstone_caves", + "minecraft:end_barrens", + "minecraft:end_highlands", + "minecraft:end_midlands", + "minecraft:eroded_badlands", + "minecraft:flower_forest", + "minecraft:forest", + "minecraft:frozen_ocean", + "minecraft:frozen_peaks", + "minecraft:frozen_river", + "minecraft:grove", + "minecraft:ice_spikes", + "minecraft:jagged_peaks", + "minecraft:jungle", + "minecraft:lukewarm_ocean", + "minecraft:lush_caves", + "minecraft:mangrove_swamp", + "minecraft:meadow", + "minecraft:mushroom_fields", + "minecraft:nether_wastes", + "minecraft:ocean", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:pale_garden", + "minecraft:plains", + "minecraft:river", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:small_end_islands", + "minecraft:snowy_beach", + "minecraft:snowy_plains", + "minecraft:snowy_slopes", + "minecraft:snowy_taiga", + "minecraft:soul_sand_valley", + "minecraft:sparse_jungle", + "minecraft:stony_peaks", + "minecraft:stony_shore", + "minecraft:sunflower_plains", + "minecraft:swamp", + "minecraft:taiga", + "minecraft:the_end", + "minecraft:the_void", + "minecraft:warm_ocean", + "minecraft:warped_forest", + "minecraft:windswept_forest", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_hills", + "minecraft:windswept_savanna", + "minecraft:wooded_badlands" +] diff --git a/src/test/resources/biomes/1.26.x.json b/src/test/resources/biomes/1.26.x.json new file mode 100644 index 0000000000..643e7e18ea --- /dev/null +++ b/src/test/resources/biomes/1.26.x.json @@ -0,0 +1,68 @@ +[ + "minecraft:badlands", + "minecraft:bamboo_jungle", + "minecraft:basalt_deltas", + "minecraft:beach", + "minecraft:birch_forest", + "minecraft:cherry_grove", + "minecraft:cold_ocean", + "minecraft:crimson_forest", + "minecraft:custom", + "minecraft:dark_forest", + "minecraft:deep_cold_ocean", + "minecraft:deep_dark", + "minecraft:deep_frozen_ocean", + "minecraft:deep_lukewarm_ocean", + "minecraft:deep_ocean", + "minecraft:desert", + "minecraft:dripstone_caves", + "minecraft:end_barrens", + "minecraft:end_highlands", + "minecraft:end_midlands", + "minecraft:eroded_badlands", + "minecraft:flower_forest", + "minecraft:forest", + "minecraft:frozen_ocean", + "minecraft:frozen_peaks", + "minecraft:frozen_river", + "minecraft:grove", + "minecraft:ice_spikes", + "minecraft:jagged_peaks", + "minecraft:jungle", + "minecraft:lukewarm_ocean", + "minecraft:lush_caves", + "minecraft:mangrove_swamp", + "minecraft:meadow", + "minecraft:mushroom_fields", + "minecraft:nether_wastes", + "minecraft:ocean", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:pale_garden", + "minecraft:plains", + "minecraft:river", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:small_end_islands", + "minecraft:snowy_beach", + "minecraft:snowy_plains", + "minecraft:snowy_slopes", + "minecraft:snowy_taiga", + "minecraft:soul_sand_valley", + "minecraft:sparse_jungle", + "minecraft:stony_peaks", + "minecraft:stony_shore", + "minecraft:sunflower_plains", + "minecraft:swamp", + "minecraft:taiga", + "minecraft:the_end", + "minecraft:the_void", + "minecraft:warm_ocean", + "minecraft:warped_forest", + "minecraft:windswept_forest", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_hills", + "minecraft:windswept_savanna", + "minecraft:wooded_badlands" +]