Compare commits

...

88 Commits

Author SHA1 Message Date
renovate[bot] 689d4a4fe9
chore(deps): Update dependency io.netty:netty-all to v4.1.87.Final 2023-01-14 03:18:36 +00:00
renovate[bot] f0671fb8b8
chore(deps): Update dependency com.google.code.gson:gson to v2.10.1 2023-01-07 02:41:15 +00:00
renovate[bot] 9cf6d9e991
chore(deps): Update dependency io.netty:netty-all to v4.1.86.Final 2022-12-17 01:14:35 +00:00
Tad Hunt b0a93c2c35
feat: make the portal reload command usable from the console and rcon (#338) 2022-12-15 11:40:15 +00:00
renovate[bot] 5229339a8c
chore(deps): Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.13 2022-12-11 06:44:06 +00:00
renovate[bot] 1a759dcc76
chore(deps): Update Deps to v4.5.14 2022-12-04 13:32:31 +00:00
renovate[bot] 93a6aface2
chore(deps): Update dependency gradle to v7.6 2022-11-26 01:53:29 +00:00
renovate[bot] 0b64f47b8a
chore(deps): Update dependency io.netty:netty-all to v4.1.85.Final 2022-11-12 02:01:15 +00:00
renovate[bot] 617ccfd66a
chore(deps): Update dependency com.google.code.gson:gson to v2.10 2022-10-29 01:42:02 +00:00
Osiris-Team e808668fce
fix: updated author name, fixes #334 and #326 (#335)
* Update bungee.yml

* Update plugin.yml

* Update AdvancedPortalsPlugin.java
2022-10-24 12:11:57 +01:00
renovate[bot] 91d52b8c1b
chore(deps): Update dependency io.netty:netty-all to v4.1.84.Final 2022-10-15 00:12:25 +00:00
renovate[bot] eb71f1c1d1
chore(deps): Update Deps 2022-09-17 00:16:56 +00:00
renovate[bot] 15956b4844
chore(deps): Update dependency io.netty:netty-all to v4.1.81.Final 2022-09-10 01:14:53 +00:00
renovate[bot] 4f60d8e319
chore(deps): Update dependency io.netty:netty-all to v4.1.80.Final 2022-08-27 01:30:51 +00:00
renovate[bot] f5f06167db
chore(deps): Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.12 2022-08-07 11:15:02 +00:00
renovate[bot] 0f595fac7d
chore(deps): Update Deps 2022-08-06 00:44:07 +00:00
renovate[bot] 051fc6c92e
chore(deps): Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.11 2022-07-30 10:40:54 +00:00
renovate[bot] 22483ac052
chore(deps): Update Deps to v10.37.4 2022-07-30 01:35:48 +00:00
renovate[bot] 51aa6dac47
chore(deps): Update Deps 2022-07-16 00:48:28 +00:00
renovate[bot] 029f117fc1
chore(deps): Update dependency io.netty:netty-all to v4.1.78.Final 2022-06-18 00:46:05 +00:00
Renovate Bot 87cd76cdeb
chore(deps): Update Deps to v10.37.1 2022-05-28 02:31:30 +00:00
Renovate Bot 34b0127f99
chore(deps): Update Deps to v10.37.0 2022-05-21 00:59:11 +00:00
Renovate Bot 7d3597faad
chore(deps): Update dependency io.netty:netty-all to v4.1.77.Final 2022-05-07 02:28:47 +00:00
Renovate Bot 58e7e3ad78
chore(deps): Update dependency io.netty:netty-all to v4.1.76.Final 2022-04-16 00:05:08 +00:00
Renovate Bot 6906772138
chore(deps): Update dependency gradle to v7.4.2 2022-04-02 00:10:40 +00:00
Renovate Bot 080aae4a9e
chore(deps): Update Deps to v10.36.5 2022-03-26 00:40:54 +00:00
Renovate Bot f6620ef2eb
chore(deps): Update Deps 2022-03-19 02:07:09 +00:00
Renovate Bot 05359480a3
chore(deps): Update Deps 2022-03-12 00:38:13 +00:00
Renovate Bot a317acce3d
chore(deps): Update Deps to v10.34.1 2022-03-05 21:00:38 +00:00
Renovate Bot 9b7c09955e
chore(deps): Update Deps to v10.34.0 2022-03-05 08:57:24 +00:00
Renovate Bot 8eb3a2926b
chore(deps): Update Deps to v10.33.1 2022-03-05 00:51:36 +00:00
Renovate Bot 71e67f2010 chore(deps): update actions/setup-java action to v3 2022-02-25 12:56:33 +00:00
Sekwah 5df74aae28 release version: 0.9.2 [skip ci] 2022-02-24 00:31:25 +00:00
Sekwah 4904d806be Update CHANGELOG.md [skip ci] 2022-02-24 00:31:21 +00:00
Sekwah 9a64ae58c7 fix: Removes the false positive warning from McAntiMalware
Fixes #300
2022-02-24 00:30:23 +00:00
Renovate Bot c504909668
chore(deps): Update Deps 2022-02-12 01:12:00 +00:00
Renovate Bot 5b79228be7
chore(deps): Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.9 2022-02-05 02:05:11 +00:00
Renovate Bot 6ab4c363ac chore(deps): Update Deps 2022-01-20 20:01:53 +00:00
Renovate Bot 5751879abd
chore(deps): Update dependency gradle to v7.3.3 2021-12-25 00:30:32 +00:00
Renovate Bot 7d82fa3879
chore(deps): Update Deps 2021-12-18 01:19:17 +00:00
Sekwah 1bad72bbc2 release version: 0.9.1 [skip ci] 2021-12-17 02:09:11 +00:00
Sekwah f8bec4c1ee Update CHANGELOG.md [skip ci] 2021-12-17 02:09:07 +00:00
Sekwah 75d2be30fe fix: Error in position checks for portal creation 2021-12-17 02:08:24 +00:00
Sekwah 787c1d09b4
chore(ci): Update release support flags 2021-12-15 00:29:37 +00:00
Sekwah 20c56219f9 release version: 0.9.0 [skip ci] 2021-12-15 00:14:44 +00:00
Sekwah 778ad2ab31 Update CHANGELOG.md [skip ci] 2021-12-15 00:14:40 +00:00
JOO200 e3021367ab feat: WorldEdit Integration, fix logic error 2021-12-15 00:13:30 +00:00
JOO200 fdb22ab8b5 feat: Added WorldEdit Integration
* New config option to enable WorldEdit integration
* New command "/portal we-selection <name>" to select the Portal as WorldEdit selection
* When enabled: Create portals with WorldEdit selections, disable AdvancedPortal's Wand
2021-12-15 00:13:30 +00:00
JOO200 d16ccb7717 chore(deps): Update Velocity to 3.1.0 2021-12-15 00:13:30 +00:00
Renovate Bot 2207324598
chore(deps): Update Deps 2021-12-11 00:17:25 +00:00
Renovate Bot d916deb3a9
chore(deps): Update dependency gradle to v7.3.1 2021-12-04 00:03:50 +00:00
Sekwah 659fcca7ee docs: Update changelog
I assume the merge type messed up who was responsible for the pr. Try to use rebase and not squash.
2021-11-29 12:11:33 +00:00
Mohammed Al-Dahleh 3928922de3 feat: Adds ability to configure warp message 2021-11-29 12:00:25 +00:00
Sekwah a9e660db65
chore(ci): Allow manual triggering 2021-11-29 11:55:03 +00:00
Renovate Bot 486cff7e09
chore(deps): Update Deps to v10.32.3 2021-11-27 01:42:09 +00:00
Renovate Bot d09ad72491
chore(deps): Update dependency gradle to v7.3 2021-11-13 00:07:40 +00:00
Renovate Bot 7d5e96f291
chore(deps): Update dependency io.netty:netty-all to v4.1.70.Final 2021-11-06 02:18:42 +00:00
Sekwah 393ad01d45
chore(ci): Update to list 1.17 as supported automatically 2021-10-31 01:30:59 +01:00
Renovate Bot 71d08da9dc
chore(deps): Update Deps 2021-10-30 02:03:28 +00:00
Renovate Bot f225363e67
chore(deps): Update dependency io.netty:netty-all to v4.1.69.Final 2021-10-16 01:40:06 +00:00
Renovate Bot 162505553f
chore(deps): Update Deps to v10.32.1 2021-10-02 01:33:11 +00:00
Renovate Bot 812f4c78dc
chore(deps): Update Deps to v10.32.0 2021-09-18 01:11:04 +00:00
Renovate Bot 0ab32790eb
chore(deps): Update Deps 2021-09-11 00:37:54 +00:00
Renovate Bot 0be605fe3a
chore(deps): Update dependency com.velocitypowered:velocity-api to v1.1.9 2021-09-04 01:24:55 +00:00
Sekwah 64f0f5113e release version: 0.8.0 [skip ci] 2021-09-01 16:48:06 +00:00
Sekwah fb80fbb515 Update CHANGELOG.md [skip ci] 2021-09-01 16:48:03 +00:00
Sekwah 81d64ecc5a feat: Allow the ability to disable the proxy warning message 2021-09-01 17:46:58 +01:00
Renovate Bot aacf626635
chore(deps): Update Deps 2021-08-21 00:15:54 +00:00
Renovate Bot 12ab00f004
chore(deps): Update Deps 2021-08-14 01:05:18 +00:00
Renovate Bot 065fa22852
chore(deps): Update Deps 2021-07-25 15:07:59 +00:00
Sekwah 012ddf6e36
chore(ci): Update rennovate config 2021-07-25 16:04:48 +01:00
Sekwah 9b3adf7ba4 release version: 0.7.2 [skip ci] 2021-07-14 08:35:41 +00:00
Sekwah ab9dbe027e Update CHANGELOG.md [skip ci] 2021-07-14 08:35:38 +00:00
Sekwah 62307c6bcf fix: Issue where portal events activate too early in survival
Fixes #228
2021-07-14 09:34:36 +01:00
Renovate Bot e2b0723d24 chore(deps): update dependency com.velocitypowered:velocity-api to v1.1.9 2021-07-06 23:46:12 +01:00
Renovate Bot 1a57a509e6 chore(deps): update dependency gradle to v7.1.1 2021-07-04 12:18:30 +01:00
Sekwah ee8f0ff3d0 release version: 0.7.1 [skip ci] 2021-06-30 09:23:07 +00:00
Sekwah 05d2a51fbf Update CHANGELOG.md [skip ci] 2021-06-30 09:23:04 +00:00
Sekwah e73d84afa3 fix: Access to portal warp command locked behind wrong perm
Fixes #272
2021-06-30 10:22:12 +01:00
Renovate Bot d4b642ec23 chore(deps): update dependency gradle to v7 2021-06-29 13:26:03 +01:00
Sekwah bc683183f6 release version: 0.7.0 [skip ci] 2021-06-27 20:28:53 +00:00
Sekwah 3a5460cff3 Update CHANGELOG.md [skip ci] 2021-06-27 20:28:50 +00:00
Sekwah f364828176 feat: Added missing commands from tab complete 2021-06-27 21:28:11 +01:00
Renovate Bot dfe5cfc26d chore(deps): update dependency net.md-5:bungeecord-api to v1.16-r0.4 2021-06-27 21:11:27 +01:00
Sekwah ebd94fd081
chore(ci): removed verbose mode for release 2021-06-27 21:09:41 +01:00
Renovate Bot ffee4fbbbe chore(deps): update dependency com.google.code.gson:gson to v2.8.7 2021-06-27 21:07:20 +01:00
Renovate Bot dcf8456511 chore(deps): update dependency gradle to v6.9 2021-06-27 21:07:00 +01:00
Renovate Bot 1ac1fe7e2e chore(deps): update dependency com.velocitypowered:velocity-api to v1.1.8 2021-06-27 21:06:23 +01:00
25 changed files with 1156 additions and 632 deletions

View File

@ -0,0 +1,8 @@
# What Changed
Whatever changed here
## Release Notes
If anything should be commented in the changelog release notes.
**NOTE:** Please remove this unless something important needs to be shared.
It's just to save time looking up what is needed in the event we need to.

View File

@ -1,6 +1,6 @@
name: Release
on: [push]
on: [push, workflow_dispatch]
jobs:
build:
@ -22,7 +22,7 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
restore-keys: ${{ runner.os }}-node
- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
@ -43,5 +43,5 @@ jobs:
CURSE_API: ${{ secrets.CURSE_API }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
run: |
npx auto shipit -v
auto shipit

View File

@ -1,16 +1,12 @@
# v0.6.1 (Sun Jun 27 2021)
# v0.9.2 (Thu Feb 24 2022)
#### 🐛 Bug Fix
- chore(ci): Remove isDevBranch remains [#265](https://github.com/sekwah41/Advanced-Portals/pull/265) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Fix forgotten sha in build gradle [#264](https://github.com/sekwah41/Advanced-Portals/pull/264) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Update version-bumping task order [#263](https://github.com/sekwah41/Advanced-Portals/pull/263) ([@sekwah41](https://github.com/sekwah41))
- chore(deps): pin dependencies [#261](https://github.com/sekwah41/Advanced-Portals/pull/261) ([@renovate-bot](https://github.com/renovate-bot))
- fix: Spigot 1.17 error message [#260](https://github.com/sekwah41/Advanced-Portals/pull/260) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Swapping build pipeline ([@sekwah41](https://github.com/sekwah41))
- ci: Fixed java version ([@sekwah41](https://github.com/sekwah41))
- ci: Fix changelog reference ([@sekwah41](https://github.com/sekwah41))
- ci: Updated build pipelines to newer module ([@sekwah41](https://github.com/sekwah41))
- fix: Removes the false positive warning from McAntiMalware [#318](https://github.com/sekwah41/Advanced-Portals/pull/318) ([@sekwah41](https://github.com/sekwah41))
- chore(deps): Update Deps ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.9 ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update Deps [#316](https://github.com/sekwah41/Advanced-Portals/pull/316) ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency gradle to v7.3.3 ([@renovate-bot](https://github.com/renovate-bot))
#### Authors: 2
@ -19,6 +15,141 @@
---
# v0.9.1 (Fri Dec 17 2021)
#### 🐛 Bug Fix
- fix: Error in position checks for portal creation [#310](https://github.com/sekwah41/Advanced-Portals/pull/310) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Update release support flags ([@sekwah41](https://github.com/sekwah41))
#### Authors: 1
- Sekwah ([@sekwah41](https://github.com/sekwah41))
---
# v0.9.0 (Wed Dec 15 2021)
#### 🚀 Enhancement
- feat: WorldEdit Integration, fix logic error [#307](https://github.com/sekwah41/Advanced-Portals/pull/307) ([@JOO200](https://github.com/JOO200))
- feat: Added WorldEdit Integration [#307](https://github.com/sekwah41/Advanced-Portals/pull/307) ([@JOO200](https://github.com/JOO200))
- feat: Adds ability to configure warp message [#302](https://github.com/sekwah41/Advanced-Portals/pull/302) ([@maldahleh](https://github.com/maldahleh))
#### 🐛 Bug Fix
- chore(deps): Update Velocity to 3.1.0 [#307](https://github.com/sekwah41/Advanced-Portals/pull/307) ([@JOO200](https://github.com/JOO200))
- chore(deps): Update Deps ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency gradle to v7.3.1 ([@renovate-bot](https://github.com/renovate-bot))
- docs: Update changelog ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Allow manual triggering ([@sekwah41](https://github.com/sekwah41))
- chore(deps): Update Deps to v10.32.3 ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency gradle to v7.3 ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency io.netty:netty-all to v4.1.70.Final ([@renovate-bot](https://github.com/renovate-bot))
- chore(ci): Update to list 1.17 as supported automatically ([@sekwah41](https://github.com/sekwah41))
- chore(deps): Update dependency io.netty:netty-all to v4.1.69.Final ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update Deps to v10.32.1 ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update Deps to v10.32.0 ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): Update dependency com.velocitypowered:velocity-api to v1.1.9 ([@renovate-bot](https://github.com/renovate-bot))
#### Authors: 4
- [@JOO200](https://github.com/JOO200)
- Mohammed Al-Dahleh ([@maldahleh](https://github.com/maldahleh))
- Sekwah ([@sekwah41](https://github.com/sekwah41))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# v0.8.0 (Wed Sep 01 2021)
#### 🚀 Enhancement
- feat: Allow the ability to disable the proxy warning message [#292](https://github.com/sekwah41/Advanced-Portals/pull/292) ([@maldahleh](https://github.com/maldahleh))
#### 🐛 Bug Fix
- chore(deps): Update Deps ([@renovate-bot](https://github.com/renovate-bot))
- chore(ci): Update rennovate config ([@sekwah41](https://github.com/sekwah41))
#### Authors: 2
- Mohammed Al-Dahleh ([@maldahleh](https://github.com/maldahleh))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# v0.7.2 (Wed Jul 14 2021)
#### 🐛 Bug Fix
- fix: Issue where portal events activate too early in survival [#280](https://github.com/sekwah41/Advanced-Portals/pull/280) ([@sekwah41](https://github.com/sekwah41))
- chore(deps): update dependency com.velocitypowered:velocity-api to v1.1.9 [#278](https://github.com/sekwah41/Advanced-Portals/pull/278) ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): update dependency gradle to v7.1.1 [#277](https://github.com/sekwah41/Advanced-Portals/pull/277) ([@renovate-bot](https://github.com/renovate-bot))
#### Authors: 2
- Sekwah ([@sekwah41](https://github.com/sekwah41))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# v0.7.1 (Wed Jun 30 2021)
#### 🐛 Bug Fix
- fix: Access to portal warp command locked behind wrong perm [#275](https://github.com/sekwah41/Advanced-Portals/pull/275) ([@sekwah41](https://github.com/sekwah41))
- chore(deps): update dependency gradle to v7 [#271](https://github.com/sekwah41/Advanced-Portals/pull/271) ([@renovate-bot](https://github.com/renovate-bot))
#### Authors: 2
- Sekwah ([@sekwah41](https://github.com/sekwah41))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# v0.7.0 (Sun Jun 27 2021)
#### 🚀 Enhancement
- feat: Added missing commands from tab complete [#270](https://github.com/sekwah41/Advanced-Portals/pull/270) ([@sekwah41](https://github.com/sekwah41))
#### 🐛 Bug Fix
- chore(deps): update dependency net.md-5:bungeecord-api to v1.16-r0.4 [#269](https://github.com/sekwah41/Advanced-Portals/pull/269) ([@renovate-bot](https://github.com/renovate-bot))
- chore(ci): removed verbose mode for release ([@sekwah41](https://github.com/sekwah41))
- chore(deps): update dependency com.google.code.gson:gson to v2.8.7 [#262](https://github.com/sekwah41/Advanced-Portals/pull/262) ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): update dependency gradle to v6.9 [#267](https://github.com/sekwah41/Advanced-Portals/pull/267) ([@renovate-bot](https://github.com/renovate-bot))
- chore(deps): update dependency com.velocitypowered:velocity-api to v1.1.8 [#266](https://github.com/sekwah41/Advanced-Portals/pull/266) ([@renovate-bot](https://github.com/renovate-bot))
#### Authors: 2
- Sekwah ([@sekwah41](https://github.com/sekwah41))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# v0.6.1 (Sun Jun 27 2021)
#### 🐛 Bug Fix
- chore(ci): Remove isDevBranch remains [#265](https://github.com/sekwah41/Advanced-Portals/pull/265) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Fix forgotten sha in build gradle [#264](https://github.com/sekwah41/Advanced-Portals/pull/264) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Update version-bumping task order [#263](https://github.com/sekwah41/Advanced-Portals/pull/263) ([@sekwah41](https://github.com/sekwah41))
- chore(deps): pin dependencies [#261](https://github.com/sekwah41/Advanced-Portals/pull/261) ([@renovate-bot](https://github.com/renovate-bot))
- fix: Spigot 1.17 error message [#260](https://github.com/sekwah41/Advanced-Portals/pull/260) ([@sekwah41](https://github.com/sekwah41))
- chore(ci): Swapping build pipeline ([@sekwah41](https://github.com/sekwah41))
- ci: Fixed java version ([@sekwah41](https://github.com/sekwah41))
- ci: Fix changelog reference ([@sekwah41](https://github.com/sekwah41))
- ci: Updated build pipelines to newer module ([@sekwah41](https://github.com/sekwah41))
#### Authors: 2
- Sekwah ([@sekwah41](https://github.com/sekwah41))
- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
---
# Changelog
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

View File

@ -25,9 +25,9 @@ buildscript {
jcenter()
}
dependencies {
classpath "org.apache.httpcomponents:httpmime:4.5.13"
classpath "com.google.code.gson:gson:2.8.6"
classpath "org.apache.httpcomponents:httpclient:4.5.13"
classpath "org.apache.httpcomponents:httpmime:4.5.14"
classpath "com.google.code.gson:gson:2.10.1"
classpath "org.apache.httpcomponents:httpclient:4.5.14"
}
}
@ -79,6 +79,7 @@ repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://nexus.velocitypowered.com/repository/maven-public/" }
maven { url 'https://papermc.io/repo/repository/maven-public/' }
maven { url 'https://maven.enginehub.org/repo/' } // WorldEdit
}
// includeLibs just says to include the library in the final jar
@ -86,14 +87,15 @@ dependencies {
//implementation "org.bukkit:bukkit:1.16.1-R0.1-SNAPSHOT"
implementation "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT"
implementation "net.md-5:bungeecord-api:1.15-SNAPSHOT"
implementation "net.md-5:bungeecord-api:1.16-R0.4"
implementation "com.velocitypowered:velocity-api:1.1.0-SNAPSHOT"
annotationProcessor "com.velocitypowered:velocity-api:1.1.0-SNAPSHOT"
implementation "com.velocitypowered:velocity-api:3.1.1"
annotationProcessor "com.velocitypowered:velocity-api:3.1.1"
implementation "io.netty:netty-all:4.0.4.Final"
implementation "io.netty:netty-all:4.1.87.Final"
compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
implementation "com.sk89q.worldedit:worldedit-bukkit:7.2.13"
//compile fileTree(dir: 'libs', include: ['*.jar'])
}
@ -253,6 +255,8 @@ task curseforge {
def versions = gameVersions.findAll { it.gameVersionTypeID == gameVersionTypeID }
String[] supportedVersions = [
"1.18",
"1.17",
"1.16",
"1.15",
"1.14",

View File

@ -4,4 +4,4 @@ org.gradle.caching=true
github=https://github.com/sekwah41/Advanced-Portals
curse_project_id=86001
version=0.6.1
version=0.9.2

Binary file not shown.

View File

@ -1,6 +1,6 @@
#Sun Jan 19 19:02:36 KST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

285
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright 2015 the original author or authors.
# 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.
@ -17,78 +17,113 @@
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# 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/subprojects/plugins/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
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# 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##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
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
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
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"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || 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
@ -105,79 +140,105 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
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=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=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# 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.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# 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
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
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" "$@"

192
gradlew.bat vendored
View File

@ -1,100 +1,92 @@
@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
@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=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@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%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
: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 %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
@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
@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.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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

View File

@ -1,12 +1,12 @@
{
"devDependencies": {
"conventional-changelog-angular": "5.0.12",
"@auto-it/conventional-commits": "10.29.3",
"@auto-it/exec": "10.29.3",
"@auto-it/first-time-contributor": "10.29.3",
"@auto-it/gradle": "10.29.3",
"@auto-it/released": "10.29.3",
"@auto-it/upload-assets": "10.29.3",
"auto": "10.29.3"
"conventional-changelog-angular": "5.0.13",
"@auto-it/conventional-commits": "10.37.6",
"@auto-it/exec": "10.37.6",
"@auto-it/first-time-contributor": "10.37.6",
"@auto-it/gradle": "10.37.6",
"@auto-it/released": "10.37.6",
"@auto-it/upload-assets": "10.37.6",
"auto": "10.37.6"
}
}

View File

@ -1,5 +1,15 @@
{
"extends": [
"config:base"
],
"packageRules": [
{
"commitMessagePrefix": "chore(deps):",
"matchUpdateTypes": ["minor", "patch"],
"automerge": true,
"automergeType": "branch",
"groupName": "Deps",
"schedule": ["every weekend"]
}
]
}

View File

@ -6,6 +6,7 @@ import com.sekwah.advancedportals.bukkit.config.ConfigAccessor;
import com.sekwah.advancedportals.bukkit.listeners.Listeners;
import com.sekwah.advancedportals.bukkit.portals.AdvancedPortal;
import com.sekwah.advancedportals.bukkit.portals.Portal;
import com.sekwah.advancedportals.bukkit.util.WorldEditIntegration;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.*;
import org.bukkit.*;
@ -54,6 +55,15 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
ConfigAccessor config = new ConfigAccessor(plugin, "config.yml");
ConfigAccessor portalConfig = new ConfigAccessor(plugin, "portals.yml");
if (!(sender instanceof Player)) {
if(args.length == 1) {
if(args[0].equalsIgnoreCase("reload")) {
Listeners.reloadValues(plugin);
Portal.loadPortals();
sender.sendMessage("portal reloaded.");
return true;
}
}
sender.sendMessage(PluginMessages.customPrefixFail + " You cannot use commands with the console.");
return true;
}
@ -120,6 +130,11 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
break;
case "wand":
case "selector":
if (plugin.isWorldEditActive()) {
sender.sendMessage(PluginMessages.customPrefix
+ " Use the WorldEdit wand to select stuff. Checkout //wand.");
return true;
}
String ItemID = config.getConfig().getString("AxeItemId");
Material WandMaterial = Material.getMaterial(ItemID);
@ -187,244 +202,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
PluginMessages.customPrefix + " You have been given a \u00A7ePortal Block\u00A7a!");
break;
case "create":
if (player.hasMetadata("Pos1World") && player.hasMetadata("Pos2World")) {
if (player.getMetadata("Pos1World").get(0).asString()
.equals(player.getMetadata("Pos2World").get(0).asString())
&& player.getMetadata("Pos1World").get(0).asString()
.equals(player.getLocation().getWorld().getName())) {
if (args.length >= 2) { // may make this next piece of code more efficient, maybe check
// against a list of available variables or something
// TODO change system to use arrays and hashmaps
boolean hasName = false;
boolean hasTriggerBlock = false;
boolean hasDestination = false;
boolean isBungeePortal = false;
boolean needsPermission = false;
boolean executesCommand = false;
String destination = null;
String portalName = null;
String triggerBlock = null;
String serverName = null;
String permission = null;
String portalCommand = null;
ArrayList<PortalArg> extraData = new ArrayList<>();
// Is completely changed in the recode but for now im leaving it as this
// horrible mess...
for (int i = 1; i < args.length; i++) {
if (startsWithPortalArg("name:", args[i])) {
portalName = args[i].replaceFirst("name:", "");
if (portalName.equals("")) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You must include a name for the portal that isnt nothing!");
return true;
}
hasName = true;
portalName = args[i].replaceFirst("name:", "");
} else if (startsWithPortalArg("destination:", args[i])) {
hasDestination = true;
destination = args[i].toLowerCase().replaceFirst("destination:", "");
} else if (startsWithPortalArg("desti:", args[i])) {
hasDestination = true;
destination = args[i].toLowerCase().replaceFirst("desti:", "");
} else if (startsWithPortalArg("triggerblock:", args[i])) {
hasTriggerBlock = true;
triggerBlock = args[i].toLowerCase().replaceFirst("triggerblock:", "");
} else if (this.startsWithPortalArg("bungee:", args[i])) {
isBungeePortal = true;
serverName = args[i].substring("bungee:".length());
} else if (startsWithPortalArg("permission:", args[i])) {
needsPermission = true;
permission = args[i].toLowerCase().replaceFirst("permission:", "");
extraData.add(new PortalArg("permission", permission));
} else if (startsWithPortalArg("delayed:", args[i])) {
boolean delayed = Boolean
.parseBoolean(args[i].toLowerCase().replaceFirst("delayed:", ""));
extraData.add(new PortalArg("delayed", Boolean.toString(delayed)));
} else if (startsWithPortalArg("message:", args[i])) {
String message = parseArgVariable(args, i, "message:");
if (message == null) {
player.sendMessage(
PluginMessages.customPrefixFail + " Message quotes not closed!");
return true;
}
extraData.add(new PortalArg("message", message));
} else if (startsWithPortalArg("command:", args[i])) {
executesCommand = true;
portalCommand = parseArgVariable(args, i, "command:");
if (portalCommand == null) {
player.sendMessage(
PluginMessages.customPrefixFail + " Command quotes not closed!");
return true;
}
i += this.portalArgsStringLength - 1;
if (portalCommand.startsWith("#")
&& !(this.plugin.getSettings().enabledCommandLevel("c")
&& (sender.hasPermission(
"advancedportals.createportal.commandlevel.console")
|| sender.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a console command portal!");
return true;
} else if (portalCommand.startsWith("!")
&& !(this.plugin.getSettings().enabledCommandLevel("o")
&& (sender.hasPermission(
"advancedportals.createportal.commandlevel.op")
|| sender.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a op command portal!");
return true;
} else if (portalCommand.startsWith("%")
&& !(this.plugin.getSettings().enabledCommandLevel("b")
&& (sender.hasPermission(
"advancedportals.createportal.commandlevel.bungee")
|| sender.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a bungee command portal!");
return true;
} else if (portalCommand.startsWith("^")
&& !(this.plugin.getSettings().enabledCommandLevel("p")
&& (sender.hasPermission(
"advancedportals.createportal.commandlevel.perms")
|| sender.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a all perms command portal!");
return true;
}
extraData.add(new PortalArg("command.1", portalCommand));
} else if (startsWithPortalArg("cooldowndelay:", args[i])) {
String cooldownDelay = parseArgVariable(args, i, "cooldowndelay:");
extraData.add(new PortalArg("cooldowndelay", cooldownDelay));
} else if (startsWithPortalArg("leavedesti:", args[i])) {
String leaveDesti = parseArgVariable(args, i, "leavedesti:");
extraData.add(new PortalArg("leavedesti", leaveDesti));
} else if (startsWithPortalArg("particlein:", args[i])) {
String value = parseArgVariable(args, i, "particlein:");
extraData.add(new PortalArg("particlein", value));
} else if (startsWithPortalArg("particleout:", args[i])) {
String value = parseArgVariable(args, i, "particleout:");
extraData.add(new PortalArg("particleout", value));
}
}
if (!hasName) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You must include a name for the portal that you are creating in the variables!");
return true;
}
World world = org.bukkit.Bukkit
.getWorld(player.getMetadata("Pos1World").get(0).asString());
Location pos1 = new Location(world, player.getMetadata("Pos1X").get(0).asInt(),
player.getMetadata("Pos1Y").get(0).asInt(),
player.getMetadata("Pos1Z").get(0).asInt());
Location pos2 = new Location(world, player.getMetadata("Pos2X").get(0).asInt(),
player.getMetadata("Pos2Y").get(0).asInt(),
player.getMetadata("Pos2Z").get(0).asInt());
ConfigAccessor desticonfig = new ConfigAccessor(plugin, "destinations.yml");
String destiPosX = desticonfig.getConfig().getString(destination + ".pos.X");
if (!Portal.portalExists(portalName)) {
player.sendMessage("");
player.sendMessage(PluginMessages.customPrefix
+ "\u00A7e You have created a new portal with the following details:");
player.sendMessage("\u00A7aname: \u00A7e" + portalName);
if (hasDestination) {
if (!isBungeePortal && destiPosX == null) {
player.sendMessage("\u00A7cdestination: \u00A7e" + destination
+ " (destination does not exist)");
return true;
} else {
player.sendMessage("\u00A7adestination: \u00A7e" + destination);
}
} else {
player.sendMessage(
"\u00A7cdestination: \u00A7eN/A (will not teleport to a location)");
}
if (isBungeePortal) {
player.sendMessage("\u00A7abungee: \u00A7e" + serverName);
}
if (needsPermission) {
player.sendMessage("\u00A7apermission: \u00A7e" + permission);
} else {
player.sendMessage("\u00A7apermission: \u00A7e(none needed)");
}
for (PortalArg portalArg : extraData) {
if (!ignoreExtras.contains(portalArg.argName)) {
player.sendMessage(
"\u00A7a" + portalArg.argName + ": \u00A7e" + portalArg.value);
}
}
if (executesCommand) {
player.sendMessage("\u00A7acommand: \u00A7e" + portalCommand);
}
if (hasTriggerBlock) {
Set<Material> materialSet = Portal
.getMaterialSet(triggerBlock.toUpperCase().split(","));
if (materialSet.size() != 0) {
player.sendMessage(
"\u00A7atriggerBlock: \u00A7e" + triggerBlock.toUpperCase());
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
materialSet, serverName, portalArgs));
if(materialSet.contains(Material.END_GATEWAY)) {
AdvancedPortal portal = Portal.getPortal(portalName);
if(portal != null) {
disableBeacons(portal);
}
}
} else {
ConfigAccessor Config = new ConfigAccessor(plugin, "config.yml");
player.sendMessage("\u00A7ctriggerBlock: \u00A7edefault("
+ Config.getConfig().getString("DefaultPortalTriggerBlock") + ")");
player.sendMessage("\u00A7c" + triggerBlock.toUpperCase()
+ " no valid blocks were listed so the default has been set.");
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
serverName, portalArgs));
}
} else {
ConfigAccessor Config = new ConfigAccessor(plugin, "config.yml");
player.sendMessage("\u00A7atriggerBlock: \u00A7edefault("
+ Config.getConfig().getString("DefaultPortalTriggerBlock") + ")");
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
serverName, portalArgs));
}
} else {
sender.sendMessage(
PluginMessages.customPrefixFail + " A portal by that name already exists!");
}
// add code to save the portal to the portal config and reload the portals
player.sendMessage("");
} else {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need to at least add the name of the portal as a variable, \u00A7cType \u00A7e/portal variables\u00A7c"
+ " for a full list of currently available variables and an example command!");
}
} else {
player.sendMessage(PluginMessages.customPrefixFail
+ " The points you have selected need to be in the same world!");
}
} else {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need to have two points selected to make a portal!");
}
break;
return createPortalRequest(player, args);
case "variables":
sender.sendMessage(
PluginMessages.customPrefix +
@ -631,6 +409,14 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
case "help":
helpCommand(sender, command, args);
break;
case "bukkitpage":
sender.sendMessage(
PluginMessages.customPrefix + " Bukkit Page: http://dev.bukkit.org/bukkit-plugins/advanced-portals/");
break;
case "helppage":
sender.sendMessage(
PluginMessages.customPrefix + " Help Page: https://www.guilded.gg/Sekwah/groups/MDqAZyrD/channels/72ffdaa3-9273-4722-bf47-b75408b371af/docs/1090356006");
break;
case "show":
if (args.length > 1) {
String posX = portalConfig.getConfig().getString(args[1] + ".pos1.X");
@ -658,6 +444,24 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
}
}
break;
case "we-selection":
if (!Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
player.sendMessage(PluginMessages.customPrefixFail + " WorldEdit is not enabled.");
return true;
}
if (args.length <= 1) {
player.sendMessage(PluginMessages.customPrefixFail + " Specify a portal name!");
return true;
}
AdvancedPortal wePortal = Portal.getPortal(args[1]);
if (wePortal == null) {
sender.sendMessage(PluginMessages.customPrefixFail + " No portal by that name exists!");
return true;
}
WorldEditIntegration.explainRegion(player, wePortal.getPos1(), wePortal.getPos2());
player.sendMessage(PluginMessages.customPrefix
+ " The portal has been selected with worldedit!");
break;
case "reload":
sender.sendMessage(PluginMessages.customPrefix + " Reloaded values!");
Listeners.reloadValues(plugin);
@ -711,6 +515,272 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
}
}
private boolean checkValidSelection(Player player) {
if (plugin.isWorldEditActive()) {
if (!WorldEditIntegration.validateSelection(player)) {
player.sendMessage(PluginMessages.customPrefixFail
+ " Your WorldEdit selection is invalid!");
return false;
}
} else {
if (!player.hasMetadata("Pos1World") || !player.hasMetadata("Pos2World")) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need to have two points selected to make a portal!");
return false;
}
if (!player.getMetadata("Pos1World").get(0).asString()
.equals(player.getMetadata("Pos2World").get(0).asString())
|| !player.getMetadata("Pos1World").get(0).asString()
.equals(player.getLocation().getWorld().getName())) {
player.sendMessage(PluginMessages.customPrefixFail
+ " The points you have selected need to be in the same world as each other and yourself!");
return false;
}
}
return true;
}
private boolean createPortalRequest(Player player, String[] args) {
if (!checkValidSelection(player)) {
return true;
}
if (args.length < 2) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need to at least add the name of the portal as a variable, \u00A7cType \u00A7e/portal variables\u00A7c"
+ " for a full list of currently available variables and an example command!");
return true;
}
// may make this next piece of code more efficient, maybe check
// against a list of available variables or something
// TODO change system to use arrays and hashmaps
boolean hasName = false;
boolean hasTriggerBlock = false;
boolean hasDestination = false;
boolean isBungeePortal = false;
boolean needsPermission = false;
boolean executesCommand = false;
String destination = null;
String portalName = null;
String triggerBlock = null;
String serverName = null;
String permission = null;
String portalCommand = null;
ArrayList<PortalArg> extraData = new ArrayList<>();
// Is completely changed in the recode but for now im leaving it as this
// horrible mess...
for (int i = 1; i < args.length; i++) {
if (startsWithPortalArg("name:", args[i])) {
portalName = args[i].replaceFirst("name:", "");
if (portalName.equals("")) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You must include a name for the portal that isnt nothing!");
return true;
}
hasName = true;
portalName = args[i].replaceFirst("name:", "");
} else if (startsWithPortalArg("destination:", args[i])) {
hasDestination = true;
destination = args[i].toLowerCase().replaceFirst("destination:", "");
} else if (startsWithPortalArg("desti:", args[i])) {
hasDestination = true;
destination = args[i].toLowerCase().replaceFirst("desti:", "");
} else if (startsWithPortalArg("triggerblock:", args[i])) {
hasTriggerBlock = true;
triggerBlock = args[i].toLowerCase().replaceFirst("triggerblock:", "");
} else if (this.startsWithPortalArg("bungee:", args[i])) {
isBungeePortal = true;
serverName = args[i].substring("bungee:".length());
} else if (startsWithPortalArg("permission:", args[i])) {
needsPermission = true;
permission = args[i].toLowerCase().replaceFirst("permission:", "");
extraData.add(new PortalArg("permission", permission));
} else if (startsWithPortalArg("delayed:", args[i])) {
boolean delayed = Boolean
.parseBoolean(args[i].toLowerCase().replaceFirst("delayed:", ""));
extraData.add(new PortalArg("delayed", Boolean.toString(delayed)));
} else if (startsWithPortalArg("message:", args[i])) {
String message = parseArgVariable(args, i, "message:");
if (message == null) {
player.sendMessage(
PluginMessages.customPrefixFail + " Message quotes not closed!");
return true;
}
extraData.add(new PortalArg("message", message));
} else if (startsWithPortalArg("command:", args[i])) {
executesCommand = true;
portalCommand = parseArgVariable(args, i, "command:");
if (portalCommand == null) {
player.sendMessage(
PluginMessages.customPrefixFail + " Command quotes not closed!");
return true;
}
i += this.portalArgsStringLength - 1;
if (portalCommand.startsWith("#")
&& !(this.plugin.getSettings().enabledCommandLevel("c")
&& (player.hasPermission(
"advancedportals.createportal.commandlevel.console")
|| player.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a console command portal!");
return true;
} else if (portalCommand.startsWith("!")
&& !(this.plugin.getSettings().enabledCommandLevel("o")
&& (player.hasPermission(
"advancedportals.createportal.commandlevel.op")
|| player.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a op command portal!");
return true;
} else if (portalCommand.startsWith("%")
&& !(this.plugin.getSettings().enabledCommandLevel("b")
&& (player.hasPermission(
"advancedportals.createportal.commandlevel.bungee")
|| player.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a bungee command portal!");
return true;
} else if (portalCommand.startsWith("^")
&& !(this.plugin.getSettings().enabledCommandLevel("p")
&& (player.hasPermission(
"advancedportals.createportal.commandlevel.perms")
|| player.isOp()))) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You need permission to make a all perms command portal!");
return true;
}
extraData.add(new PortalArg("command.1", portalCommand));
} else if (startsWithPortalArg("cooldowndelay:", args[i])) {
String cooldownDelay = parseArgVariable(args, i, "cooldowndelay:");
extraData.add(new PortalArg("cooldowndelay", cooldownDelay));
} else if (startsWithPortalArg("leavedesti:", args[i])) {
String leaveDesti = parseArgVariable(args, i, "leavedesti:");
extraData.add(new PortalArg("leavedesti", leaveDesti));
} else if (startsWithPortalArg("particlein:", args[i])) {
String value = parseArgVariable(args, i, "particlein:");
extraData.add(new PortalArg("particlein", value));
} else if (startsWithPortalArg("particleout:", args[i])) {
String value = parseArgVariable(args, i, "particleout:");
extraData.add(new PortalArg("particleout", value));
}
}
if (!hasName) {
player.sendMessage(PluginMessages.customPrefixFail
+ " You must include a name for the portal that you are creating in the variables!");
return true;
}
Location pos1, pos2;
if (plugin.isWorldEditActive()) {
pos1 = WorldEditIntegration.getPos1(player);
pos2 = WorldEditIntegration.getPos2(player);
} else {
World world = Bukkit
.getWorld(player.getMetadata("Pos1World").get(0).asString());
pos1 = new Location(world, player.getMetadata("Pos1X").get(0).asInt(),
player.getMetadata("Pos1Y").get(0).asInt(),
player.getMetadata("Pos1Z").get(0).asInt());
pos2 = new Location(world, player.getMetadata("Pos2X").get(0).asInt(),
player.getMetadata("Pos2Y").get(0).asInt(),
player.getMetadata("Pos2Z").get(0).asInt());
}
ConfigAccessor desticonfig = new ConfigAccessor(plugin, "destinations.yml");
String destiPosX = desticonfig.getConfig().getString(destination + ".pos.X");
if (!Portal.portalExists(portalName)) {
player.sendMessage("");
player.sendMessage(PluginMessages.customPrefix
+ "\u00A7e You have created a new portal with the following details:");
player.sendMessage("\u00A7aname: \u00A7e" + portalName);
if (hasDestination) {
if (!isBungeePortal && destiPosX == null) {
player.sendMessage("\u00A7cdestination: \u00A7e" + destination
+ " (destination does not exist)");
return true;
} else {
player.sendMessage("\u00A7adestination: \u00A7e" + destination);
}
} else {
player.sendMessage(
"\u00A7cdestination: \u00A7eN/A (will not teleport to a location)");
}
if (isBungeePortal) {
player.sendMessage("\u00A7abungee: \u00A7e" + serverName);
}
if (needsPermission) {
player.sendMessage("\u00A7apermission: \u00A7e" + permission);
} else {
player.sendMessage("\u00A7apermission: \u00A7e(none needed)");
}
for (PortalArg portalArg : extraData) {
if (!ignoreExtras.contains(portalArg.argName)) {
player.sendMessage(
"\u00A7a" + portalArg.argName + ": \u00A7e" + portalArg.value);
}
}
if (executesCommand) {
player.sendMessage("\u00A7acommand: \u00A7e" + portalCommand);
}
if (hasTriggerBlock) {
Set<Material> materialSet = Portal
.getMaterialSet(triggerBlock.toUpperCase().split(","));
if (materialSet.size() != 0) {
player.sendMessage(
"\u00A7atriggerBlock: \u00A7e" + triggerBlock.toUpperCase());
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
materialSet, serverName, portalArgs));
if(materialSet.contains(Material.END_GATEWAY)) {
AdvancedPortal portal = Portal.getPortal(portalName);
if(portal != null) {
disableBeacons(portal);
}
}
} else {
ConfigAccessor Config = new ConfigAccessor(plugin, "config.yml");
player.sendMessage("\u00A7ctriggerBlock: \u00A7edefault("
+ Config.getConfig().getString("DefaultPortalTriggerBlock") + ")");
player.sendMessage("\u00A7c" + triggerBlock.toUpperCase()
+ " no valid blocks were listed so the default has been set.");
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
serverName, portalArgs));
}
} else {
ConfigAccessor Config = new ConfigAccessor(plugin, "config.yml");
player.sendMessage("\u00A7atriggerBlock: \u00A7edefault("
+ Config.getConfig().getString("DefaultPortalTriggerBlock") + ")");
PortalArg[] portalArgs = new PortalArg[extraData.size()];
portalArgs = extraData.toArray(portalArgs);
player.sendMessage(Portal.create(pos1, pos2, portalName, destination,
serverName, portalArgs));
}
} else {
player.sendMessage(
PluginMessages.customPrefixFail + " A portal by that name already exists!");
}
// add code to save the portal to the portal config and reload the portals
player.sendMessage("");
return true;
}
private boolean startsWithPortalArg(String portalArg, String arg) {
return arg.toLowerCase().startsWith(portalArg) && arg.length() > portalArg.length();
}
@ -718,7 +788,8 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
private void helpCommand(CommandSender sender, String command, String[] args) {
// Add pages if there starts to become too many
if (args.length == 1) {
sendMenu(sender, "Help Menu", "\u00A76/" + command + " selector \u00A7a- gives you a region selector",
sendMenu(sender, "Help Menu",
"\u00A76/" + command + " selector \u00A7a- gives you a region selector",
"\u00A76/" + command + " create \u00A7c[tags] \u00A7a- creates a portal with a selection ",
"\u00A76/" + command + " portalblock \u00A7a- gives you a portal block",
"\u00A76/" + command + " endportalblock \u00A7a- gives you an end portal block",
@ -889,8 +960,14 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
if (sender.hasPermission("advancedportals.createportal")) {
if (args.length == 1 || (args.length == 2 && args[0].equalsIgnoreCase("help"))) {
autoComplete.addAll(Arrays.asList("create", "list", "portalblock", "select", "unselect", "command",
"selector", "show", "gatewayblock", "endportalblock", "variables", "wand", "disablebeacon", "remove", "rename",
"show", "gatewayblock", "endportalblock", "variables", "disablebeacon", "remove", "rename",
"help", "bukkitpage", "helppage"));
if (Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
autoComplete.add("we-selection");
}
if (!plugin.isWorldEditActive()) {
autoComplete.addAll(Arrays.asList("selector", "wand"));
}
} else if (args[0].equalsIgnoreCase("create")) {
boolean hasName = false;
@ -996,8 +1073,10 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
}
}
}
else if (args.length == 2 && (args[0].equalsIgnoreCase("remove")
|| args[0].equalsIgnoreCase("disablebeacon"))) {
else if (args.length == 2 &&
(args[0].equalsIgnoreCase("remove")
|| args[0].equalsIgnoreCase("disablebeacon")
|| args[0].equalsIgnoreCase("we-selection"))) {
for (AdvancedPortal portal : Portal.portals) {
autoComplete.add(portal.getName());
}

View File

@ -9,6 +9,7 @@ import com.sekwah.advancedportals.bukkit.listeners.*;
import com.sekwah.advancedportals.bukkit.metrics.Metrics;
import com.sekwah.advancedportals.bukkit.portals.Portal;
import com.sekwah.advancedportals.bungee.BungeeMessages;
import org.bukkit.Bukkit;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
@ -24,6 +25,9 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
protected boolean isProxyPluginEnabled = false;
protected boolean forceRegisterProxyChannels = false;
protected boolean disableProxyWarning = false;
private boolean worldEditActive = false;
protected static final Map<String, String> PLAYER_DESTI_MAP = new HashMap<>();
@ -45,6 +49,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
FileConfiguration pluginConfig = config.getConfig();
forceRegisterProxyChannels = pluginConfig.getBoolean(ConfigHelper.FORCE_ENABLE_PROXY_SUPPORT, false);
disableProxyWarning = pluginConfig.getBoolean(ConfigHelper.DISABLE_PROXY_WARNING, false);
ConfigAccessor portalConfig = new ConfigAccessor(this, "portals.yml");
portalConfig.saveDefaultConfig();
@ -73,8 +78,12 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
for (Player player:
this.getServer().getOnlinePlayers()) {
player.removeMetadata("hasWarped", this);
player.removeMetadata("lavaWarped", this);
player.removeMetadata(Listeners.HAS_WARPED, this);
player.removeMetadata(Listeners.LAVA_WARPED, this);
}
if (settings.enabledWorldEditIntegration() && Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
worldEditActive = true;
}
// thanks to the new config accessor code the config.saveDefaultConfig(); will now
@ -140,7 +149,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
return true;
}
} catch(NoSuchMethodError | NullPointerException e) {
getLogger().info("BungeeCord config not detected, ignoring settings");
if(!disableProxyWarning) getLogger().info("BungeeCord config not detected, ignoring settings");
}
// Will be valid if paperspigot is being used. Otherwise catch.
@ -152,10 +161,10 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
return true;
}
} catch(NoSuchMethodError | NullPointerException e) {
getLogger().info("Paper config not detected, ignoring paper settings");
if(!disableProxyWarning) getLogger().info("Paper config not detected, ignoring paper settings");
}
getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml) " +
if(!disableProxyWarning) getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml) " +
"or if you are using Paper settings.velocity-support.enabled may not be enabled (paper.yml)" );
return false;
}
@ -170,4 +179,8 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
public Settings getSettings() {
return settings;
}
public boolean isWorldEditActive() {
return worldEditActive;
}
}

View File

@ -1,27 +1,34 @@
package com.sekwah.advancedportals.bukkit;
import com.sekwah.advancedportals.bukkit.config.ConfigAccessor;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
public class PluginMessages {
private final AdvancedPortalsPlugin plugin;
private static String WARP_MESSAGE;
public boolean useCustomPrefix = false;
public static String customPrefix = "\u00A7a[\u00A7eAdvancedPortals\u00A7a]";
public static String customPrefixFail = "\u00A7c[\u00A77AdvancedPortals\u00A7c]";
public PluginMessages (AdvancedPortalsPlugin plugin) {
this.plugin = plugin;
ConfigAccessor config = new ConfigAccessor(this.plugin, "config.yml");
ConfigAccessor config = new ConfigAccessor(plugin, "config.yml");
this.useCustomPrefix = config.getConfig().getBoolean("UseCustomPrefix");
if (useCustomPrefix) {
PluginMessages.customPrefix = config.getConfig().getString("CustomPrefix").replaceAll("&(?=[0-9a-fk-or])", "\u00A7");
PluginMessages.customPrefixFail = config.getConfig().getString("CustomPrefixFail").replaceAll("&(?=[0-9a-fk-or])", "\u00A7");
}
WARP_MESSAGE = ChatColor.translateAlternateColorCodes('&', config.getConfig().getString("WarpMessage", "&aYou have warped to &e<warp>&a"));
}
// This class is so then the common messages in commands or just messages over the commands are the same and can be
// easily changed.
public static String getWarpMessage(String warp) {
String cleanedWarp = warp.replace("_", " ");
return WARP_MESSAGE.replace("<warp>", cleanedWarp);
}
public static void UnknownCommand(CommandSender sender, String command) {
sender.sendMessage(customPrefixFail + " You need to type something after /" + command + "\n");
sender.sendMessage("\u00A7cIf you do not know what you can put or would like some help with the commands please type \u00A7e" + '"' + "\u00A7e/" + command + " help" + '"' + "\u00A7c\n");

View File

@ -15,10 +15,13 @@ public class Settings {
private String commandLevels = "n";
private boolean worldEditEnabled = false;
public enum PortalConfigOption {
COMMAND_LEVELS("CommandLevels"),
WARP_PARTICLES("WarpParticles"),
WARP_SOUND("WarpSound");
WARP_SOUND("WarpSound"),
WORLDEDIT_INTEGRATION("WorldEditIntegration");
private final String target;
@ -38,6 +41,8 @@ public class Settings {
commandLevels = config.getConfig().getString(COMMAND_LEVELS.value(), "opcb");
worldEditEnabled = config.getConfig().getBoolean(WORLDEDIT_INTEGRATION.value(), false);
assert commandLevels != null;
if(commandLevels.equals("opchek")) {
commandLevels = "opcb";
@ -63,4 +68,8 @@ public class Settings {
public int getCurrentWarpParticles() {
return currentWarpParticles;
}
public boolean enabledWorldEditIntegration() {
return worldEditEnabled;
}
}

View File

@ -9,6 +9,7 @@ public class ConfigHelper {
public static final String COMMAND_LOGS = "CommandLogs";
public static final String FORCE_ENABLE_PROXY_SUPPORT = "ForceEnableProxySupport";
public static final String DISABLE_PROXY_WARNING = "DisableProxyWarning";
public static final String PROXY_TELEPORT_DELAY = "ProxyTeleportDelay";
@ -34,6 +35,7 @@ public class ConfigHelper {
} else if(configVersion.equals("0.5.4")) {
config.set(ConfigHelper.CONFIG_VERSION, "0.5.11");
config.set(ConfigHelper.COMMAND_LOGS, true);
update();
} else if(configVersion.equals("0.5.10") || configVersion.equals("0.5.11")) {
config.set(ConfigHelper.CONFIG_VERSION, "0.5.13");
config.set(ConfigHelper.FORCE_ENABLE_PROXY_SUPPORT, false);

View File

@ -164,10 +164,10 @@ public class Destination {
if (PORTAL_MESSAGE_DISPLAY == 1) {
player.sendMessage("");
player.sendMessage(PluginMessages.customPrefix + "\u00A7a You have been warped to \u00A7e" + dest.replaceAll("_", " ") + "\u00A7a.");
player.sendMessage(PluginMessages.customPrefix + PluginMessages.getWarpMessage(dest));
player.sendMessage("");
} else if (PORTAL_MESSAGE_DISPLAY == 2 && !hideActionbar) {
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText("\u00A7aYou have warped to \u00A7e" + dest.replaceAll("_", " ") + "\u00A7a."));
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(PluginMessages.getWarpMessage(dest)));
}
Location newLoc = player.getLocation();

View File

@ -34,6 +34,9 @@ public class Listeners implements Listener {
private final AdvancedPortalsPlugin plugin;
public static String HAS_WARPED = "hasWarped";
public static String LAVA_WARPED = "lavaWarped";
@SuppressWarnings("deprecation")
public Listeners(AdvancedPortalsPlugin plugin) {
this.plugin = plugin;
@ -133,14 +136,11 @@ public class Listeners implements Listener {
for (Location loc : locations) {
if (delayed ? Portal.locationInPortal(portal, loc, 1)
: Portal.locationInPortalTrigger(portal, loc)) {
if (portal.getTriggers().contains(Material.NETHER_PORTAL)) {
if (player.getGameMode().equals(GameMode.CREATIVE)) {
player.setMetadata("hasWarped", new FixedMetadataValue(plugin, true));
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveWarpData(player), 10);
}
}
player.setMetadata(HAS_WARPED, new FixedMetadataValue(plugin, true));
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveWarpData(player), 10);
if (portal.getTriggers().contains(Material.LAVA)) {
player.setMetadata("lavaWarped", new FixedMetadataValue(plugin, true));
player.setMetadata(LAVA_WARPED, new FixedMetadataValue(plugin, true));
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveLavaData(player), 10);
}
if (portal.inPortal.contains(player.getUniqueId()))
@ -231,7 +231,7 @@ public class Listeners implements Listener {
@Override
public void run() {
player.removeMetadata("lavaWarped", plugin);
player.removeMetadata(LAVA_WARPED, plugin);
player.setFireTicks(0);
}
}
@ -247,7 +247,7 @@ public class Listeners implements Listener {
@Override
public void run() {
if (player != null && player.isOnline()) {
player.removeMetadata("hasWarped", plugin);
player.removeMetadata(HAS_WARPED, plugin);
}
}
}
@ -263,7 +263,7 @@ public class Listeners implements Listener {
if (event.getEntity() instanceof Player && (event.getCause() == EntityDamageEvent.DamageCause.LAVA
|| event.getCause() == EntityDamageEvent.DamageCause.FIRE
|| event.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK)) {
if (event.getEntity().hasMetadata("lavaWarped")
if (event.getEntity().hasMetadata(LAVA_WARPED)
| Portal.inPortalTriggerRegion(event.getEntity().getLocation()))
event.setCancelled(true);
}
@ -276,14 +276,14 @@ public class Listeners implements Listener {
}
Player player = event.getPlayer();
if (!player.hasMetadata("hasWarped")) {
if (!player.hasMetadata(HAS_WARPED)) {
Location loc = event.getFrom();
Location eyeLoc = new Location(loc.getWorld(), loc.getX(), loc.getY() + player.getEyeHeight(), loc.getZ());
checkTriggerLocations(player, true, loc, eyeLoc);
}
if (player.hasMetadata("hasWarped") | Portal.inPortalRegion(event.getFrom(), 1))
if (player.hasMetadata(HAS_WARPED) | Portal.inPortalRegion(event.getFrom(), 1))
event.setCancelled(true);
}
@ -329,8 +329,8 @@ public class Listeners implements Listener {
}
if (player.hasPermission("advancedportals.createportal")) {
if (event.getItem() != null && event.getItem().getType() == WandMaterial // was type id
if (!plugin.getSettings().enabledWorldEditIntegration()
&& event.getItem() != null && event.getItem().getType() == WandMaterial // was type id
&& (!UseOnlyServerAxe || (checkItemForName(event.getItem()) && event.getItem().getItemMeta()
.getDisplayName().equals("\u00A7ePortal Region Selector")))) {
@ -371,7 +371,6 @@ public class Listeners implements Listener {
// Returns the event so no more code is executed(stops unnecessary code being
// executed)
}
} else if (checkItemForName(event.getItem())
&& event.getItem().getItemMeta().getDisplayName().equals("\u00A75Portal Block Placer")
&& event.getAction() == Action.LEFT_CLICK_BLOCK

View File

@ -577,12 +577,15 @@ public class Portal {
} else if (command.startsWith("!") && plugin.getSettings().enabledCommandLevel("o")) {
command = command.substring(1);
boolean wasOp = player.isOp();
try {
player.setOp(true);
if(!wasOp) {
try {
player.setOp(true);
player.chat("/" + command);
} finally {
player.setOp(false);
}
} else {
player.chat("/" + command);
// player.performCommand(command);
} finally {
player.setOp(wasOp);
}
} else if (command.startsWith("^") && plugin.getSettings().enabledCommandLevel("p")) {
command = command.substring(1);

View File

@ -0,0 +1,47 @@
package com.sekwah.advancedportals.bukkit.util;
import com.sk89q.worldedit.IncompleteRegionException;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
import org.bukkit.Location;
import org.bukkit.entity.Player;
public class WorldEditIntegration {
private static Region getCurrentSelection(Player player) {
LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(BukkitAdapter.adapt(player));
try {
return localSession.getSelection(BukkitAdapter.adapt(player.getWorld()));
} catch (IncompleteRegionException e) {
return null;
}
}
public static boolean validateSelection(Player player) {
return getCurrentSelection(player) instanceof CuboidRegion;
}
public static Location getPos1(Player player) {
Region currentSelection = getCurrentSelection(player);
if (!(currentSelection instanceof CuboidRegion)) return null;
return BukkitAdapter.adapt(player.getWorld(), ((CuboidRegion) currentSelection).getPos1());
}
public static Location getPos2(Player player) {
Region currentSelection = getCurrentSelection(player);
if (currentSelection == null) return null;;
return BukkitAdapter.adapt(player.getWorld(), ((CuboidRegion) currentSelection).getPos2());
}
public static void explainRegion(Player player, Location pos1, Location pos2) {
LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(BukkitAdapter.adapt(player));
RegionSelector selector = new CuboidRegionSelector(BukkitAdapter.adapt(player.getWorld()), BukkitAdapter.asBlockVector(pos1), BukkitAdapter.asBlockVector(pos2));
localSession.setRegionSelector(BukkitAdapter.adapt(player.getWorld()), selector);
selector.explainRegionAdjust(BukkitAdapter.adapt(player), localSession);
}
}

View File

@ -23,7 +23,8 @@ import java.util.concurrent.TimeUnit;
*/
@Plugin(id = "advancedportals", name = "Advanced Portals",
url = "https://www.spigotmc.org/resources/advanced-portals.14356/",
version = "0.6.1")
authors = {"sekwah"},
version = "0.9.2")
public class AdvancedPortalsPlugin {
public HashMap<String, String[]> PlayerDestiMap = new HashMap<>();

View File

@ -1,4 +1,4 @@
main: com.sekwah.advancedportals.bungee.AdvancedPortalsPlugin
name: AdvancedPortals
version: 0.6.1
author: sekwah41
version: 0.9.2
author: sekwah

View File

@ -65,6 +65,9 @@ CustomPrefix: '&a[&eAdvancedPortals&a]'
CustomPrefixFail: '&c[&7AdvancedPortals&c]'
# Message sent to player in chat/action bar on warp
WarpMessage: '&aYou have warped to &e<warp>&a.'
BlockSpectatorMode: false
PortalCooldown: 5 # How long after trying to enter a portal until the player can try to enter another. 0 or lower to deactivate.
@ -95,3 +98,10 @@ ForceEnableProxySupport: false
# How many seconds after the proxy event fires should the player be teleported (should help with on spawn plugins and such)
# 0 is disabled and anything higher causes a delay.
ProxyTeleportDelay: 0
# Just in case you are not using the proxy and dont want the warning message
DisableProxyWarning: false
# Whether the integration with worldedit should be enabled.
# This will force AdvancedPortals to use WorldEdit selections.
WorldEditIntegration: false

View File

@ -1,15 +1,19 @@
main: com.sekwah.advancedportals.bukkit.AdvancedPortalsPlugin
name: AdvancedPortals
version: 0.6.1
author: sekwah41
version: 0.9.2
author: sekwah
description: An advanced portals plugin for bukkit.
api-version: 1.13
softdepend:
- WorldEdit
commands:
advancedportals:
description: The main command for the advanced portals
aliases: [portals, aportals, portal, ap]
usage: /<command>
permission: advancedportals.portal
permission: advancedportals.portalcommand
destination:
description: Can be used to access portal destinations.
aliases: [desti]
@ -50,6 +54,9 @@ permissions:
advancedportals.portal:
description: Allows use of portal commands
default: op
advancedportals.portalcommand:
description: Access to the portal command. This is seperate to allow access to portal warps without the rest.
default: true
advancedportals.build:
description: Allows you to build in the portal regions
default: op

359
yarn.lock
View File

@ -2,43 +2,44 @@
# yarn lockfile v1
"@auto-it/bot-list@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/bot-list/-/bot-list-10.29.3.tgz#cd4e1fa003a0f07496ea0b944d6b0ade75248e1b"
integrity sha512-A0sFwq0teyW+mkYiu8RQLR1DMiTdDsj9+Q8jQsKa+IiWjgOKcr/A1Qqwce6p60u1zGG/JGrlCHpqxu52U7cgMw==
"@auto-it/bot-list@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/bot-list/-/bot-list-10.37.6.tgz#3ca9380a44b9c8d33b2088b8fed2c2ffc79c91ed"
integrity sha512-ltcLZEzXOOWh24qgNE4mPYJR25Dh9mQy2QwyD8uOE01Vy0yu89RGLi0TahUlUNZUSPBjLYUCxNOcp9WHKBJ7Sg==
"@auto-it/conventional-commits@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/conventional-commits/-/conventional-commits-10.29.3.tgz#c1361ddb1cbca8d096104660f84bb3595086fbb9"
integrity sha512-QD40uyJUA4XS02s1KwLot/vdYBMSTwJvU0COFClufdmquH9hEOJeSBjskG9hRP+3v+ZwDppwhTyshE3HrTHUIQ==
"@auto-it/conventional-commits@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/conventional-commits/-/conventional-commits-10.37.6.tgz#e30a3130bbd6b5cdb4185b55956c73cc20589b9d"
integrity sha512-IJvKrEST7iOlKsohTPgSDkKLTRBF+5RD8arAXc7ZV9QMI9A/BmyoaMhj8uh9wt5QuSpNmw2C3EJWldbvmu695Q==
dependencies:
"@auto-it/core" "10.29.3"
"@auto-it/core" "10.37.6"
array.prototype.flatmap "^1.2.2"
conventional-changelog-core "^4.2.0"
conventional-changelog-preset-loader "^2.3.4"
conventional-commits-parser "^3.1.0"
endent "^2.0.1"
endent "^2.1.0"
fp-ts "^2.5.3"
io-ts "^2.1.2"
tslib "2.1.0"
"@auto-it/core@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-10.29.3.tgz#4ebe8f650a38e6a480a7856275e30a2b50b96dd7"
integrity sha512-4sl0nKJrc2j0wT/9sWVWCHXm8wmxde777ankESsI2TC08eNqwad/wcDXQPE6LGs4E6V0m7V51xfhU40qZHU3Rw==
"@auto-it/core@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-10.37.6.tgz#04e5f47dbd89a4ab253f9562cd214ff8b7408b7c"
integrity sha512-XfQq+DmUAg7hXSwq0KxOCGyPLlri8hJoEAp3QDaAa42CSnM5A5oZ67VaL7D/mFcSPDYK8o3w69mQfwcmOENjBA==
dependencies:
"@auto-it/bot-list" "10.29.3"
"@auto-it/bot-list" "10.37.6"
"@endemolshinegroup/cosmiconfig-typescript-loader" "^3.0.2"
"@octokit/plugin-enterprise-compatibility" "^1.2.2"
"@octokit/plugin-retry" "^3.0.1"
"@octokit/plugin-throttling" "^3.2.0"
"@octokit/rest" "^18.0.0"
"@octokit/core" "^3.5.1"
"@octokit/plugin-enterprise-compatibility" "1.3.0"
"@octokit/plugin-retry" "^3.0.9"
"@octokit/plugin-throttling" "^3.6.2"
"@octokit/rest" "^18.12.0"
await-to-js "^3.0.0"
chalk "^4.0.0"
cosmiconfig "7.0.0"
deepmerge "^4.0.0"
dotenv "^8.0.0"
endent "^2.0.1"
endent "^2.1.0"
enquirer "^2.3.4"
env-ci "^5.0.1"
fast-glob "^3.1.1"
@ -51,7 +52,7 @@
io-ts "^2.1.2"
lodash.chunk "^4.2.0"
log-symbols "^4.0.0"
node-fetch "2.6.1"
node-fetch "2.6.7"
parse-author "^2.0.0"
parse-github-url "1.0.2"
pretty-ms "^7.0.0"
@ -61,56 +62,56 @@
tapable "^2.2.0"
terminal-link "^2.1.1"
tinycolor2 "^1.4.1"
ts-node "^9.1.1"
ts-node "^10.9.1"
tslib "2.1.0"
type-fest "^0.21.1"
typescript-memoize "^1.0.0-alpha.3"
url-join "^4.0.0"
"@auto-it/exec@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/exec/-/exec-10.29.3.tgz#b5777c1f4fa7eca13ab5c97ec02351fe1f4c2333"
integrity sha512-1qdEnlKi7xtRNdCgusVEtGi+l3MSghtbPejpSVve8yxxu4DVdNSp3psEBcWlYloaJyTzsu+husT8RgzZR1eMsA==
"@auto-it/exec@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/exec/-/exec-10.37.6.tgz#b75e9b19b26a491f351bc5cdf014907baddb6b16"
integrity sha512-3ThJ93cUgIX61BZU4vi7mhfsOKI05oZZvB//Yv7EjiFvHg7mFEv1D5cE9/RHG8UJvC8bA6pBzozwLQ3iyCkRdg==
dependencies:
"@auto-it/core" "10.29.3"
endent "^2.0.1"
"@auto-it/core" "10.37.6"
endent "^2.1.0"
fp-ts "^2.5.3"
fromentries "^1.2.0"
io-ts "^2.1.2"
tslib "2.1.0"
"@auto-it/first-time-contributor@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/first-time-contributor/-/first-time-contributor-10.29.3.tgz#7dc6a038b3f5bacc315d113d87aeffa7c8187cf9"
integrity sha512-wWfV4iuJBJoqwqZEePVd+A0+OnbLAEP+636CvyeoSVsNNpscVV/ep8YdUgnKkLrELR3OWrB5FKq3orktTZJ0Zg==
"@auto-it/first-time-contributor@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/first-time-contributor/-/first-time-contributor-10.37.6.tgz#cbd95505de84068b0459d1ffd23a6a6a42497e9e"
integrity sha512-+weXEHUaXSBJfLmI5F7MZKUPrRvQM8Fr+e2lCcDW4ChyfR2YE70/wv9e3oxenZp9Ed0pHN7THH718O9Tz4GtHw==
dependencies:
"@auto-it/bot-list" "10.29.3"
"@auto-it/core" "10.29.3"
"@auto-it/bot-list" "10.37.6"
"@auto-it/core" "10.37.6"
array.prototype.flatmap "^1.2.2"
endent "^2.0.1"
endent "^2.1.0"
tslib "2.1.0"
url-join "^4.0.0"
"@auto-it/gradle@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/gradle/-/gradle-10.29.3.tgz#2a53425b4fbd51d658888a2d0affa40a31a643db"
integrity sha512-WPTfNlqCPV8IFlGvNLAOqlCSvvpO3zSZP4BuV51o6Cg9vYmWi8c95oYozOTygmeoqqypcTwyjaeXnBGIBRiLGA==
"@auto-it/gradle@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/gradle/-/gradle-10.37.6.tgz#49867179c770b0009f66aac6f85b3684e95c2df0"
integrity sha512-h/bs5VC0mJdDTrvaQ65Ae2BRSjCCfI0BlPBii1UR6pitMwynTBzeDiKnMoEkx3hBd9yyliuF9G99jxAehIdVRw==
dependencies:
"@auto-it/core" "10.29.3"
"@auto-it/core" "10.37.6"
fp-ts "^2.5.3"
io-ts "^2.1.2"
semver "^7.0.0"
tslib "2.1.0"
"@auto-it/npm@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-10.29.3.tgz#751f91235249304bc00ad7bc58f2912aadbe95ef"
integrity sha512-DwsqGckW3OAd9Wzj+QEcf/DS4Mgpb0oJznGkcqxM+ZfEeiXv+clZcS4UjemPejgyCOZbqCTvX8yh2hWOo+lCWQ==
"@auto-it/npm@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-10.37.6.tgz#a838c7880747d1871a4afacd38ccfa750cbc6500"
integrity sha512-18CpaX3YfpJ6vwONYEBy9ORiPGplrtQ30pzRtDpKZzHin5wakdOyPd1P5lWeZBmCQCyiszdRteeQsXzFbaSuoQ==
dependencies:
"@auto-it/core" "10.29.3"
"@auto-it/package-json-utils" "10.29.3"
"@auto-it/core" "10.37.6"
"@auto-it/package-json-utils" "10.37.6"
await-to-js "^3.0.0"
endent "^2.0.1"
endent "^2.1.0"
env-ci "^5.0.1"
fp-ts "^2.5.3"
get-monorepo-packages "^1.1.0"
@ -122,33 +123,33 @@
url-join "^4.0.0"
user-home "^2.0.0"
"@auto-it/package-json-utils@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/package-json-utils/-/package-json-utils-10.29.3.tgz#5a7a5e5e8a2d2d4f3acde15c4a5a56ea3894976f"
integrity sha512-V5kt9q9oqljEri4J5ww3IwUrYqumG4VF8x560J6MKQ/oL9WyWyZji8C4K+nchsaR3d7wp1b3QCfGlsVk19QVfQ==
"@auto-it/package-json-utils@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/package-json-utils/-/package-json-utils-10.37.6.tgz#442716eff1a82d39326e905d29fc1fba7155db77"
integrity sha512-rUoEcEnPgHG8X/XkPe3PKFHhXD3AsplXB0Rpr7lJQta5XzDqmWzc/xVL1vMmM4IpXMI5lK7A9OZosWjgJVI7jA==
dependencies:
parse-author "^2.0.0"
parse-github-url "1.0.2"
"@auto-it/released@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-10.29.3.tgz#fc72bf2825740e2565f09cfa0eb88cbb844d5a96"
integrity sha512-ULHWSZn0okTc5OBZz9l185DHKlXHVEJbW+CIQx+bhQYcFSFsf1b1Z6IF3rsfuNK3HnGMnlfyyipMV4Dm9jMw9Q==
"@auto-it/released@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-10.37.6.tgz#84604a7495f658848585955d986da34b8625a263"
integrity sha512-988nCdYApyzKwZx6W6lHNHS9aEw9xLFbfDcTWrSKUOChjT8yDcGadDDXVhj3M0uhHojr8jXKbrRATEPyEeTDlg==
dependencies:
"@auto-it/bot-list" "10.29.3"
"@auto-it/core" "10.29.3"
"@auto-it/bot-list" "10.37.6"
"@auto-it/core" "10.37.6"
deepmerge "^4.0.0"
fp-ts "^2.5.3"
io-ts "^2.1.2"
tslib "2.1.0"
"@auto-it/upload-assets@10.29.3":
version "10.29.3"
resolved "https://registry.yarnpkg.com/@auto-it/upload-assets/-/upload-assets-10.29.3.tgz#ac600217fe164c1dc93cb1db1a69d70f73bf606a"
integrity sha512-cohIhSuhzAcMY4Dnbllx6w+lofwTiHcEXMpOtw1d/72ezst6uB8VkLyAxNavGBvWASV+ZjptNo6tiIWnk0om4A==
"@auto-it/upload-assets@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/upload-assets/-/upload-assets-10.37.6.tgz#3a330cae6d6fa53c3cb94cbf5e510568c426193f"
integrity sha512-Qhx0unBadMnIjPj86gm4jpoKaI4WcPjOSePZzuTAJdXRM82/i5EEfgzTZ9ZwoCC6NzXARjx99v264oS3SHZEiA==
dependencies:
"@auto-it/core" "10.29.3"
endent "^2.0.1"
"@auto-it/core" "10.37.6"
endent "^2.1.0"
fast-glob "^3.1.1"
file-type "^16.0.0"
fp-ts "^2.5.3"
@ -156,6 +157,17 @@
terminal-link "^2.1.1"
tslib "2.1.0"
"@auto-it/version-file@10.37.6":
version "10.37.6"
resolved "https://registry.yarnpkg.com/@auto-it/version-file/-/version-file-10.37.6.tgz#7f66b9d332fcdfa8581d3fd8216a8ba55af11291"
integrity sha512-BO7f1bWrUFkhp7RwwmkegBUc/VwJrIlQQaFm7l/cc5IGZ7DL0rPap8UbytSL3aWV9YzoZpqgWNj2KPRGvwguag==
dependencies:
"@auto-it/core" "10.37.6"
fp-ts "^2.5.3"
io-ts "^2.1.2"
semver "^7.0.0"
tslib "1.10.0"
"@babel/code-frame@^7.0.0":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@ -177,6 +189,13 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
dependencies:
"@jridgewell/trace-mapping" "0.3.9"
"@endemolshinegroup/cosmiconfig-typescript-loader@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz#eea4635828dde372838b0909693ebd9aafeec22d"
@ -187,6 +206,24 @@
ts-node "^9"
tslib "^2"
"@jridgewell/resolve-uri@^3.0.3":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
"@jridgewell/sourcemap-codec@^1.4.10":
version "1.4.14"
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
"@jridgewell/trace-mapping@0.3.9":
version "0.3.9"
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
dependencies:
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@ -215,14 +252,14 @@
dependencies:
"@octokit/types" "^6.0.3"
"@octokit/core@^3.5.0":
version "3.5.1"
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
"@octokit/core@^3.5.1":
version "3.6.0"
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
dependencies:
"@octokit/auth-token" "^2.4.4"
"@octokit/graphql" "^4.5.8"
"@octokit/request" "^5.6.0"
"@octokit/request" "^5.6.3"
"@octokit/request-error" "^2.0.5"
"@octokit/types" "^6.0.3"
before-after-hook "^2.2.0"
@ -246,12 +283,17 @@
"@octokit/types" "^6.0.3"
universal-user-agent "^6.0.0"
"@octokit/openapi-types@^11.2.0":
version "11.2.0"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
"@octokit/openapi-types@^7.3.5":
version "7.3.5"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-7.3.5.tgz#ffd195472f345b32fb29ba3c86a1ee68c09f24b3"
integrity sha512-6bm5lzGDOeSnWHM5W8OZ86RD2KpchynU+/Qlm5hNEFjfLDhwfAY2lSe68YRUEYFGlxSHe0HmakyhvmtWoD3Zog==
"@octokit/plugin-enterprise-compatibility@^1.2.2":
"@octokit/plugin-enterprise-compatibility@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-compatibility/-/plugin-enterprise-compatibility-1.3.0.tgz#034f035cc1789b0f0d616e71e41f50f73804e89e"
integrity sha512-h34sMGdEOER/OKrZJ55v26ntdHb9OPfR1fwOx6Q4qYyyhWA104o11h9tFxnS/l41gED6WEI41Vu2G2zHDVC5lQ==
@ -259,27 +301,27 @@
"@octokit/request-error" "^2.1.0"
"@octokit/types" "^6.0.3"
"@octokit/plugin-paginate-rest@^2.6.2":
version "2.13.5"
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz#e459f9b5dccbe0a53f039a355d5b80c0a2b0dc57"
integrity sha512-3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg==
"@octokit/plugin-paginate-rest@^2.16.8":
version "2.17.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz#32e9c7cab2a374421d3d0de239102287d791bce7"
integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==
dependencies:
"@octokit/types" "^6.13.0"
"@octokit/types" "^6.34.0"
"@octokit/plugin-request-log@^1.0.2":
"@octokit/plugin-request-log@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
"@octokit/plugin-rest-endpoint-methods@5.3.4":
version "5.3.4"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.4.tgz#291dea5af9eecf4d457884d9efbcf72aabbaff57"
integrity sha512-2Y2q/FYCsW5tcwIqgnLOgzZXEb3I1VoSQGyHs/Zki/Ufs5H+uT0maPVHatLKw90LQbqK7ON8NpL3Y8IyzG6pNA==
"@octokit/plugin-rest-endpoint-methods@^5.12.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
dependencies:
"@octokit/types" "^6.16.7"
"@octokit/types" "^6.34.0"
deprecation "^2.3.1"
"@octokit/plugin-retry@^3.0.1":
"@octokit/plugin-retry@^3.0.9":
version "3.0.9"
resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz#ae625cca1e42b0253049102acd71c1d5134788fe"
integrity sha512-r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==
@ -287,10 +329,10 @@
"@octokit/types" "^6.0.3"
bottleneck "^2.15.3"
"@octokit/plugin-throttling@^3.2.0":
version "3.5.1"
resolved "https://registry.yarnpkg.com/@octokit/plugin-throttling/-/plugin-throttling-3.5.1.tgz#889e80e7f3464a18c768337369498d2d47c0b643"
integrity sha512-d2jh3/RZo98DRw2J0jFxhKz7nrTGalGdkfRtxM+pI5k1wRb4BKBjiuE9cuZnhZyj+zLC1EcIptj7K+28LJZ3eA==
"@octokit/plugin-throttling@^3.6.2":
version "3.6.2"
resolved "https://registry.yarnpkg.com/@octokit/plugin-throttling/-/plugin-throttling-3.6.2.tgz#abfc045309b8e46f6d6b6c01047eb41c4031f2f8"
integrity sha512-0az5fxgVlhFfFtiKLKVXTpmCG2tK3BG0fYI8SO4pmGlN1kyJktJVQA+6KKaFxtxMIWsuHmSEAkR6zSgtk86g2A==
dependencies:
"@octokit/types" "^6.0.1"
bottleneck "^2.15.3"
@ -316,28 +358,67 @@
node-fetch "^2.6.1"
universal-user-agent "^6.0.0"
"@octokit/rest@^18.0.0":
version "18.6.3"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.6.3.tgz#0283de05d5dbc9d3adcacb208c055db03000abf9"
integrity sha512-BeV2P48RR3MVPhSBq6KXXHMVHEJg5vnFBkFN1GKPXBohXTp+eb0gJq+5iYgkjbOMG6biNvkKllPDWJchpQHHiA==
"@octokit/request@^5.6.3":
version "5.6.3"
resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
dependencies:
"@octokit/core" "^3.5.0"
"@octokit/plugin-paginate-rest" "^2.6.2"
"@octokit/plugin-request-log" "^1.0.2"
"@octokit/plugin-rest-endpoint-methods" "5.3.4"
"@octokit/endpoint" "^6.0.1"
"@octokit/request-error" "^2.1.0"
"@octokit/types" "^6.16.1"
is-plain-object "^5.0.0"
node-fetch "^2.6.7"
universal-user-agent "^6.0.0"
"@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.13.0", "@octokit/types@^6.16.1", "@octokit/types@^6.16.7":
"@octokit/rest@^18.12.0":
version "18.12.0"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
dependencies:
"@octokit/core" "^3.5.1"
"@octokit/plugin-paginate-rest" "^2.16.8"
"@octokit/plugin-request-log" "^1.0.4"
"@octokit/plugin-rest-endpoint-methods" "^5.12.0"
"@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.16.1":
version "6.16.7"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.16.7.tgz#f27e87daf7ed87bde3e67b2e71956468fa4d02a7"
integrity sha512-OuQELiwIKeDySgNID52vm33wDRc2aaX8lKYgAw9Hmw939ITow1HspT8/AH3M3jgGFUMDmHlMNBNEmH7xV7ggXQ==
dependencies:
"@octokit/openapi-types" "^7.3.5"
"@octokit/types@^6.34.0":
version "6.34.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218"
integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
dependencies:
"@octokit/openapi-types" "^11.2.0"
"@tokenizer/token@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3"
integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w==
"@tsconfig/node10@^1.0.7":
version "1.0.9"
resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
"@tsconfig/node12@^1.0.7":
version "1.0.11"
resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
"@tsconfig/node14@^1.0.0":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
"@tsconfig/node16@^1.0.2":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
"@types/command-line-args@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.0.0.tgz#484e704d20dbb8754a8f091eee45cdd22bcff28c"
@ -389,6 +470,16 @@ JSONStream@^1.0.4:
jsonparse "^1.2.0"
through ">=2.2.7 <3"
acorn-walk@^8.1.1:
version "8.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
acorn@^8.4.1:
version "8.8.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
add-stream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@ -484,18 +575,19 @@ author-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=
auto@10.29.3:
version "10.29.3"
resolved "https://registry.yarnpkg.com/auto/-/auto-10.29.3.tgz#ee6729b65e1e80321ca2cd925a36b6e6e80675be"
integrity sha512-l8gbIsAnEL8SLuAiMCx8Zo7HMN6PprXz7k9hFJ6kOOJ23/jqiCzDmjtXaijlTVdrB5dFkHKYqs+4XjgxQM/gQQ==
auto@10.37.6:
version "10.37.6"
resolved "https://registry.yarnpkg.com/auto/-/auto-10.37.6.tgz#3bc64d60afac2cb713a0192a4f89d64816db26c7"
integrity sha512-zMLsXz/WPqSlNVlY6g1GlFyhow+x//htR2QwWYSxB4DvAFNggXnK6aRqJ1DrcjhtUAPL2ngw5hHHrCgHvyvAaw==
dependencies:
"@auto-it/core" "10.29.3"
"@auto-it/npm" "10.29.3"
"@auto-it/released" "10.29.3"
"@auto-it/core" "10.37.6"
"@auto-it/npm" "10.37.6"
"@auto-it/released" "10.37.6"
"@auto-it/version-file" "10.37.6"
await-to-js "^3.0.0"
chalk "^4.0.0"
command-line-application "^0.10.1"
endent "^2.0.1"
endent "^2.1.0"
module-alias "^2.2.2"
signale "^1.4.0"
terminal-link "^2.1.1"
@ -669,10 +761,10 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
conventional-changelog-angular@5.0.12:
version "5.0.12"
resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9"
integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==
conventional-changelog-angular@5.0.13:
version "5.0.13"
resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c"
integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==
dependencies:
compare-func "^2.0.0"
q "^1.5.1"
@ -865,7 +957,7 @@ end-of-stream@^1.1.0:
dependencies:
once "^1.4.0"
endent@^2.0.1:
endent@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/endent/-/endent-2.1.0.tgz#5aaba698fb569e5e18e69e1ff7a28ff35373cd88"
integrity sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==
@ -1687,7 +1779,14 @@ nested-error-stacks@~2.0.1:
resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b"
integrity sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==
node-fetch@2.6.1, node-fetch@^2.6.1:
node-fetch@2.6.7, node-fetch@^2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
dependencies:
whatwg-url "^5.0.0"
node-fetch@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@ -2459,6 +2558,11 @@ token-types@^2.0.0:
"@tokenizer/token" "^0.1.1"
ieee754 "^1.2.1"
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
trim-newlines@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@ -2474,7 +2578,26 @@ trim-off-newlines@^1.0.0:
resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
ts-node@^9, ts-node@^9.1.1:
ts-node@^10.9.1:
version "10.9.1"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
"@tsconfig/node12" "^1.0.7"
"@tsconfig/node14" "^1.0.0"
"@tsconfig/node16" "^1.0.2"
acorn "^8.4.1"
acorn-walk "^8.1.1"
arg "^4.1.0"
create-require "^1.1.0"
diff "^4.0.1"
make-error "^1.1.1"
v8-compile-cache-lib "^3.0.1"
yn "3.1.1"
ts-node@^9:
version "9.1.1"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
@ -2578,6 +2701,11 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
v8-compile-cache-lib@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
validate-npm-package-license@^3.0.1:
version "3.0.4"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@ -2586,6 +2714,19 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
whatwg-url@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
dependencies:
tr46 "~0.0.3"
webidl-conversions "^3.0.0"
which-boxed-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"