diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index f79425033..000000000 --- a/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,76 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at poslovitch@bentobox.world. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index d1e879d67..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -name: Bug report -about: Report a bug or a problem you're encountering with BentoBox. -title: '' -labels: 'Status: Pending, Type: Bug' -assignees: '' - ---- - -### Description -#### Describe the bug - - - - -#### Steps to reproduce the behavior - - - - -#### Screenshots and videos - - - -#### Expected behavior - - - -### Environment - -#### Server - - - - OS: **________** - - Java version: **________** - -#### Plugins - - -``` -_______ -``` - -#### BentoBox setup - -##### BentoBox and Addons - - -``` -_______ -``` - -##### Configuration - - - - Database: **________** - -### Additional context - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 203d2c4d9..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Feature request -about: Suggest an idea to improve BentoBox -title: '' -labels: 'Status: Pending, Type: Enhancement' -assignees: '' - ---- - -### Description -#### Is your feature request related to a problem? - - - -#### Describe the solution you'd like us to implement. - - - -#### Describe alternatives you've considered. - - - -### Additional context - - diff --git a/.github/ISSUE_TEMPLATE/placeholder_request.md b/.github/ISSUE_TEMPLATE/placeholder_request.md deleted file mode 100644 index 724a030b4..000000000 --- a/.github/ISSUE_TEMPLATE/placeholder_request.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: Placeholder request -about: Suggest a placeholder to use via PlaceholderAPI -title: 'Placeholder: ' -labels: 'Status: Pending, Type: Enhancement' -assignees: '' - ---- - -**Description** - - - -**Placeholder**: `__________` - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 2339fbdaa..2099fc59a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,16 @@ addons: - develop - master jdk: - - oraclejdk8 + - openjdk8 + - openjdk11 + +matrix: + allow_failures: + - jdk: openjdk11 script: - #- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B + #- sonar-scanner + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B #- echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" cache: directories: diff --git a/README.md b/README.md index 9e6192c69..b8c6d63bd 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Do not submit PRs that only address code formatting because they will not be acc BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](https://codemc.org). -### Maven dependency +### Maven ```xml @@ -108,3 +108,14 @@ BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](htt ``` + +### Gradle +```groovy +repositories { + maven { url "https://repo.codemc.org/repository/maven-public/" } +} + +dependencies { + compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE' +} +``` \ No newline at end of file diff --git a/REFERENCES.md b/REFERENCES.md deleted file mode 100644 index 06f0ddda1..000000000 --- a/REFERENCES.md +++ /dev/null @@ -1,300 +0,0 @@ -# Locale References - -This file contains a list of the locale references in the source code. See the commit date/time for the last update. - -## References - -/!\ Most command-related references are not listed at the moment. - -``` -commands.admin.setrange.range-updated -commands.help.description -commands.help.end -commands.help.header -commands.help.parameters -commands.help.syntax -commands.island.about.description -commands.island.create.creating-island -commands.island.create.unable-create-island -commands.island.go.description -commands.island.go.parameters -commands.island.go.teleport -commands.island.go.teleported -commands.island.reset.must-remove-members -commands.island.sethome.home-set -commands.island.sethome.must-be-on-your-island -commands.island.sethome.num-homes -commands.island.setname.too-long -commands.island.setname.too-short -commands.island.team.demote.failure -commands.island.team.demote.success -commands.island.team.invite.accept.name-joined-your-island -commands.island.team.invite.accept.you-joined-island -commands.island.team.invite.already-on-team -commands.island.team.invite.cannot-invite-self -commands.island.team.invite.cooldown -commands.island.team.invite.errors.invalid-invite -commands.island.team.invite.errors.island-is-full -commands.island.team.invite.errors.none-invited-you -commands.island.team.invite.errors.you-already-are-in-team -commands.island.team.invite.invitation-sent -commands.island.team.invite.name-has-invited-you -commands.island.team.invite.reject.name-rejected-your-invite -commands.island.team.invite.reject.you-rejected-invite -commands.island.team.invite.removing-invite -commands.island.team.invite.to-accept-or-reject -commands.island.team.invite.you-can-invite -commands.island.team.invite.you-will-lose-your-island -commands.island.team.kick.leader-kicked -commands.island.team.kick.type-again -commands.island.team.leave.left-your-island -commands.island.team.leave.type-again -commands.island.team.promote.failure -commands.island.team.promote.success -commands.island.team.setowner.errors.cant-transfer-to-yourself -commands.island.team.setowner.errors.target-is-not-member -commands.island.team.setowner.name-is-the-owner -commands.island.team.setowner.you-are-the-owner -commands.help.end -commands.help.description -commands.help.header -commands.help.parameters -commands.help.syntax -general.confirm -general.errors.already-have-island -general.errors.command-cancelled -general.errors.general -general.errors.no-island -general.errors.no-permission -general.errors.no-team -general.errors.not-in-team -general.errors.not-owner -general.errors.offline-player -general.errors.player-has-island -general.errors.player-has-no-island -general.errors.unknown-command -general.errors.unknown-player -general.errors.unknown-player-name -general.errors.use-in-game -general.errors.warp-not-safe -general.errors.wrong-world -general.errors.you-must-wait -general.errors.you-need -general.previous-request-cancelled -general.request-cancelled -general.success -general.tips.changing-obsidian-to-lava -language.edited -language.panel-title -language.selected -protection.command-is-banned -protection.flags.ANIMAL_SPAWN.description -protection.flags.ANIMAL_SPAWN.name -protection.flags.ANVIL.description -protection.flags.ANVIL.hint -protection.flags.ANVIL.name -protection.flags.ARMOR_STAND.description -protection.flags.ARMOR_STAND.hint -protection.flags.ARMOR_STAND.name -protection.flags.BEACON.description -protection.flags.BEACON.hint -protection.flags.BEACON.name -protection.flags.BED.description -protection.flags.BED.hint -protection.flags.BED.name -protection.flags.BREAK_BLOCKS.description -protection.flags.BREAK_BLOCKS.hint -protection.flags.BREAK_BLOCKS.name -protection.flags.BREEDING.description -protection.flags.BREEDING.hint -protection.flags.BREEDING.name -protection.flags.BREWING.description -protection.flags.BREWING.hint -protection.flags.BREWING.name -protection.flags.BUCKET.description -protection.flags.BUCKET.hint -protection.flags.BUCKET.name -protection.flags.BUTTON.description -protection.flags.BUTTON.hint -protection.flags.BUTTON.name -protection.flags.CHEST.description -protection.flags.CHEST.hint -protection.flags.CHEST.name -protection.flags.CHEST_DAMAGE.description -protection.flags.CHEST_DAMAGE.name -protection.flags.CHORUS_FRUIT.description -protection.flags.CHORUS_FRUIT.hint -protection.flags.CHORUS_FRUIT.name -protection.flags.CLEAN_SUPER_FLAT.description -protection.flags.CLEAN_SUPER_FLAT.name -protection.flags.COLLECT_LAVA.description -protection.flags.COLLECT_LAVA.hint -protection.flags.COLLECT_LAVA.name -protection.flags.COLLECT_WATER.description -protection.flags.COLLECT_WATER.hint -protection.flags.COLLECT_WATER.name -protection.flags.CRAFTING.description -protection.flags.CRAFTING.hint -protection.flags.CRAFTING.name -protection.flags.CREEPER_DAMAGE.description -protection.flags.CREEPER_DAMAGE.name -protection.flags.CREEPER_GRIEFING.description -protection.flags.CREEPER_GRIEFING.name -protection.flags.CROP_TRAMPLE.description -protection.flags.CROP_TRAMPLE.hint -protection.flags.CROP_TRAMPLE.name -protection.flags.DOOR.description -protection.flags.DOOR.hint -protection.flags.DOOR.name -protection.flags.EGGS.description -protection.flags.EGGS.hint -protection.flags.EGGS.name -protection.flags.ELYTRA.description -protection.flags.ELYTRA.hint -protection.flags.ELYTRA.name -protection.flags.ENCHANTING.description -protection.flags.ENCHANTING.hint -protection.flags.ENCHANTING.name -protection.flags.ENDERMAN_DEATH_DROP.description -protection.flags.ENDERMAN_DEATH_DROP.name -protection.flags.ENDERMAN_GRIEFING.description -protection.flags.ENDERMAN_GRIEFING.name -protection.flags.ENDER_PEARL.description -protection.flags.ENDER_PEARL.hint -protection.flags.ENDER_PEARL.name -protection.flags.ENTER_EXIT_MESSAGES.description -protection.flags.ENTER_EXIT_MESSAGES.island -protection.flags.ENTER_EXIT_MESSAGES.name -protection.flags.ENTER_EXIT_MESSAGES.now-entering -protection.flags.ENTER_EXIT_MESSAGES.now-leaving -protection.flags.FIRE.description -protection.flags.FIRE.hint -protection.flags.FIRE.name -protection.flags.FIRE_EXTINGUISH.description -protection.flags.FIRE_EXTINGUISH.hint -protection.flags.FIRE_EXTINGUISH.name -protection.flags.FIRE_SPREAD.description -protection.flags.FIRE_SPREAD.hint -protection.flags.FIRE_SPREAD.name -protection.flags.FURNACE.description -protection.flags.FURNACE.hint -protection.flags.FURNACE.name -protection.flags.GATE.description -protection.flags.GATE.hint -protection.flags.GATE.name -protection.flags.GEO_LIMIT_MOBS.description -protection.flags.GEO_LIMIT_MOBS.name -protection.flags.HURT_ANIMALS.description -protection.flags.HURT_ANIMALS.hint -protection.flags.HURT_ANIMALS.name -protection.flags.HURT_MONSTERS.description -protection.flags.HURT_MONSTERS.hint -protection.flags.HURT_MONSTERS.name -protection.flags.HURT_VILLAGERS.description -protection.flags.HURT_VILLAGERS.hint -protection.flags.HURT_VILLAGERS.name -protection.flags.ITEM_FRAME_DAMAGE.description -protection.flags.ITEM_FRAME_DAMAGE.name -protection.flags.INVINCIBLE_VISITORS.description -protection.flags.INVINCIBLE_VISITORS.hint -protection.flags.INVINCIBLE_VISITORS.name -protection.flags.ISLAND_RESPAWN.description -protection.flags.ISLAND_RESPAWN.name -protection.flags.ITEM_DROP.description -protection.flags.ITEM_DROP.hint -protection.flags.ITEM_DROP.name -protection.flags.ITEM_PICKUP.description -protection.flags.ITEM_PICKUP.hint -protection.flags.ITEM_PICKUP.name -protection.flags.JUKEBOX.description -protection.flags.JUKEBOX.hint -protection.flags.JUKEBOX.name -protection.flags.LEASH.description -protection.flags.LEASH.hint -protection.flags.LEASH.name -protection.flags.LEVER.description -protection.flags.LEVER.hint -protection.flags.LEVER.name -protection.flags.LOCK.description -protection.flags.LOCK.name -protection.flags.MILKING.description -protection.flags.MILKING.hint -protection.flags.MILKING.name -protection.flags.MONSTER_SPAWN.description -protection.flags.MONSTER_SPAWN.name -protection.flags.MOUNT_INVENTORY.description -protection.flags.MOUNT_INVENTORY.hint -protection.flags.MOUNT_INVENTORY.name -protection.flags.NOTE_BLOCK.description -protection.flags.NOTE_BLOCK.hint -protection.flags.NOTE_BLOCK.name -protection.flags.OFFLINE_REDSTONE.description -protection.flags.OFFLINE_REDSTONE.name -protection.flags.PISTON_PUSH.description -protection.flags.PISTON_PUSH.name -protection.flags.PLACE_BLOCKS.description -protection.flags.PLACE_BLOCKS.hint -protection.flags.PLACE_BLOCKS.name -protection.flags.PORTAL.description -protection.flags.PORTAL.hint -protection.flags.PORTAL.name -protection.flags.PRESSURE_PLATE.description -protection.flags.PRESSURE_PLATE.hint -protection.flags.PRESSURE_PLATE.name -protection.flags.PVP_END.description -protection.flags.PVP_END.hint -protection.flags.PVP_END.name -protection.flags.PVP_NETHER.description -protection.flags.PVP_NETHER.hint -protection.flags.PVP_NETHER.name -protection.flags.PVP_OVERWORLD.description -protection.flags.PVP_OVERWORLD.hint -protection.flags.PVP_OVERWORLD.name -protection.flags.REDSTONE.description -protection.flags.REDSTONE.hint -protection.flags.REDSTONE.name -protection.flags.RIDING.description -protection.flags.RIDING.hint -protection.flags.RIDING.name -protection.flags.REMOVE_MOBS.description -protection.flags.REMOVE_MOBS.name -protection.flags.SHEARING.description -protection.flags.SHEARING.hint -protection.flags.SHEARING.name -protection.flags.SPAWN_EGGS.description -protection.flags.SPAWN_EGGS.hint -protection.flags.SPAWN_EGGS.name -protection.flags.TNT.description -protection.flags.TNT.hint -protection.flags.TNT.name -protection.flags.TRADING.description -protection.flags.TRADING.hint -protection.flags.TRADING.name -protection.flags.TRAPDOOR.description -protection.flags.TRAPDOOR.hint -protection.flags.TRAPDOOR.name -protection.locked -protection.panel.flag-item.allowed_rank -protection.panel.flag-item.blocked_rank -protection.panel.flag-item.description-layout -protection.panel.flag-item.name-layout -protection.panel.flag-item.menu-layout -protection.panel.flag-item.minimal_rank -protection.panel.flag-item.setting-active -protection.panel.flag-item.setting-disabled -protection.panel.flag-item.setting-layout -protection.panel.PROTECTION.description -protection.panel.PROTECTION.title -protection.panel.SETTING.description -protection.panel.SETTING.title -protection.panel.WORLD_SETTING.description -protection.panel.WORLD_SETTING.title -protection.protected -ranks.admin -ranks.banned -ranks.coop -ranks.member -ranks.mod -ranks.owner -ranks.visitor -``` diff --git a/pom.xml b/pom.xml index 7441468da..f4018ab31 100644 --- a/pom.xml +++ b/pom.xml @@ -66,13 +66,13 @@ UTF-8 1.8 - 1.7.4 + 2.0.2 3.8.0 1.13.2-R0.1-SNAPSHOT 1.5 1.7 - 2.10.1 + 2.10.3 2.5.1-SNAPSHOT 1.0 @@ -80,7 +80,7 @@ -LOCAL - 1.5.3 + 1.6.0 @@ -166,6 +166,10 @@ dynmap-repo http://repo.mikeprimm.com/ + + worldedit-repo + http://maven.sk89q.com/repo/ + @@ -176,12 +180,6 @@ ${spigot.version} provided - - - world.bentobox - GitHubAPI4Java - ${githubapi.version} - org.bstats @@ -191,8 +189,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 3.0.0 test @@ -203,7 +201,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test @@ -243,6 +241,18 @@ dynmap-api 3.0-SNAPSHOT provided + + + com.sk89q.worldedit + worldedit-core + 7.0.0 + provided + + + + com.github.TheBusyBiscuit + GitHubWebAPI4Java + d5f5e0bbd8