Skip to content

Commit 24f9461

Browse files
k-jiangk-jiang
authored
Merge pull request #6 from Cong0707/master
Merge upstream
2 parents 0725303 + ff32f84 commit 24f9461

389 files changed

Lines changed: 26127 additions & 13278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_style = space
6+
indent_size = 4
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.java]
11+
end_of_line=lf
12+
13+
[*.json]
14+
indent_size = 2
15+
16+
[*.{yml,yaml}]
17+
indent_size = 2
18+
19+
[*.md]
20+
trim_trailing_whitespace = false
21+
22+
[*.sh]
23+
end_of_line = lf

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
110
_Please paste the output from `/usb version` below_
211
```
312
paste it here please (replace this text)
@@ -10,5 +19,3 @@ _What steps will reproduce the problem?_
1019

1120
_If you have any log-files, please paste them to [pastebin.com](http://pastebin.com)_
1221
* server-log: link-to-pastebin
13-
14-
(Not following the template will result in closing the issue.)

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/deploy-release.sh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/usr/bin/env bash
2+
3+
echo -e "Running release script...\n"
4+
echo -e "Publishing javadocs and artifacts...\n"
5+
cd $HOME
6+
7+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
8+
$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
9+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
10+
11+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
12+
$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
13+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
14+
15+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
16+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
17+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
18+
19+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
20+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
21+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
22+
23+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
24+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
25+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
26+
27+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
28+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
29+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
30+
31+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
32+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
33+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
34+
35+
echo -e "Publishing javadocs...\n"
36+
37+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
38+
$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
39+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/po-utils/
40+
41+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
42+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
43+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-API/
44+
45+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
46+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
47+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-APIv2/
48+
49+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
50+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
51+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/release/uSkyBlock-Core/
52+
53+
echo -e "Publishing final plugin release...\n"
54+
55+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
56+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
57+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/release/uSkyBlock/
58+
59+
rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
60+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
61+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/release.json

‎.github/deploy-staging.sh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/usr/bin/env bash
2+
3+
echo -e "Running staging script...\n"
4+
echo -e "Publishing javadocs and artifacts...\n"
5+
cd $HOME
6+
7+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
8+
$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/mvn-repo/ \
9+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
10+
11+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
12+
$HOME/work/uSkyBlock/uSkyBlock/target/mvn-repo/ \
13+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
14+
15+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
16+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/mvn-repo/ \
17+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
18+
19+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
20+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/mvn-repo/ \
21+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
22+
23+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
24+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/mvn-repo/ \
25+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
26+
27+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
28+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-FAWE/target/mvn-repo/ \
29+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
30+
31+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
32+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/mvn-repo/ \
33+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/maven/uskyblock/
34+
35+
echo -e "Publishing javadocs...\n"
36+
37+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
38+
$HOME/work/uSkyBlock/uSkyBlock/po-utils/target/site/apidocs/ \
39+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/po-utils/
40+
41+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
42+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-API/target/site/apidocs/ \
43+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-API/
44+
45+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
46+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-APIv2/target/site/apidocs/ \
47+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-APIv2/
48+
49+
rsync -r --delete --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
50+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Core/target/site/apidocs/ \
51+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/javadocs/master/uSkyBlock-Core/
52+
53+
echo -e "Publishing final plugin release...\n"
54+
55+
rsync -r --quiet -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
56+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/uSkyBlock-*.jar \
57+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/downloads/master/uSkyBlock/
58+
59+
rsync -r --quiet --no-R --no-implied-dirs -e "ssh -p 7685 -o StrictHostKeyChecking=no" \
60+
$HOME/work/uSkyBlock/uSkyBlock/uSkyBlock-Plugin/target/classes/version.json \
61+
u36810p330294@uskyblock.ovh:domains/uskyblock.ovh/public_html/versions/staging.json

‎.github/workflows/build.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Maven build
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
tags: [ 'v*' ]
7+
pull_request:
8+
branches: [ master ]
9+
10+
jobs:
11+
build_and_test:
12+
if: github.repository_owner == 'uskyblock'
13+
runs-on: ubuntu-24.04
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v3
17+
- name: Checkout submodules
18+
run: |
19+
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
20+
git submodule update --init --recursive
21+
- name: Generate additional language files
22+
run: |
23+
cd uSkyBlock-Core/src/main/po && perl en2pirate.pl && cd -
24+
cd uSkyBlock-Core/src/main/po && perl en2kitteh.pl && cd -
25+
- name: JDK 21
26+
uses: actions/setup-java@v4
27+
with:
28+
java-version: '21'
29+
distribution: 'temurin'
30+
- name: Install gettext
31+
run: sudo apt-get install -y gettext
32+
- name: Build with Maven
33+
run: gradle build
34+
35+
# Install our SSH key:
36+
- name: Install SSH key
37+
uses: shimataro/ssh-key-action@v2
38+
if: ${{ github.event_name == 'push' }}
39+
with:
40+
key: ${{ secrets.SSH_PRIVATE_KEY }}
41+
known_hosts: ${{ secrets.SSH_KNOWN_HOST }}
42+
43+
# Mark our scripts runnable:
44+
- name: Mark deploy scripts runnable
45+
if: ${{ github.event_name == 'push' }}
46+
run: |
47+
chmod +x "${GITHUB_WORKSPACE}/.github/deploy-staging.sh"
48+
chmod +x "${GITHUB_WORKSPACE}/.github/deploy-release.sh"
49+
50+
# Deploy from master branch (staging release):
51+
- name: Run deploy script for staging release
52+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
53+
run: "${GITHUB_WORKSPACE}/.github/deploy-staging.sh"
54+
55+
# Deploy from tag create (plugin release):
56+
- name: Run deploy script for plugin release
57+
if: ${{ github.event_name == 'push' && startsWith( github.ref, 'refs/tags/') }}
58+
run: "${GITHUB_WORKSPACE}/.github/deploy-release.sh"

‎.gitignore‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.settings
33
.classpath
44
bin
5-
/dependency-reduced-pom.xml
65
# Package Files #
76
*.jar
87
*.war
@@ -14,5 +13,9 @@ bin
1413
**/*.iml
1514
**/*~
1615
.idea
17-
**/target
18-
**/*.mo
16+
**/*.mo
17+
18+
*.DS_Store
19+
20+
dependency-reduced-pom.xml
21+
deploy_rsa

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "bukkit-utils"]
22
path = bukkit-utils
3-
url = git@github.com:rlf/bukkit-utils.git
3+
url = git@github.com:uskyblock/bukkit-utils.git

‎.travis.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎README.md‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,44 @@ We are on [Spigot](https://www.spigotmc.org/resources/uskyblock-revived.66795/).
88

99
This version depends on the following plugins:
1010

11-
* Bukkit/Spigot 1.15.1-R0.1-SNAPSHOT
11+
* Spigot/Paper 1.19-R0.1-SNAPSHOT
1212
* Vault 1.7.x
13-
* WorldEdit 7.1.0-SNAPSHOT
14-
* WorldGuard 7.0.2-SNAPSHOT
15-
16-
## Releases
17-
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rlf/uSkyBlock.svg)](http://isitmaintained.com/project/rlf/uSkyBlock "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rlf/uSkyBlock.svg)](http://isitmaintained.com/project/rlf/uSkyBlock "Percentage of issues still open")
13+
* WorldEdit 7.2.13
14+
* WorldGuard 7.0.8-SNAPSHOT
1815

16+
## Releases
1917
https://www.spigotmc.org/resources/uskyblock-revived.66795/history
2018

2119
Pre-releases will end in -SNAPSHOT, and is considered **unsafe** for production servers.
2220

2321
Releases have a clean version number, has been tested, and should be safe for production servers.
2422

23+
# New Maven group/artifactId
24+
Starting with version 3.0.0-SNAPSHOT, we've changed our Maven groupId's for all submodules except uSkyBlock-API.
25+
If you're using uSkyBlock-Core or po-utils as dependency in your project, update your
26+
dependencies to:
27+
28+
```xml
29+
<dependency>
30+
<groupId>ovh.uskyblock</groupId>
31+
<artifactId>uSkyBlock-Core</artifactId>
32+
<version>3.0.0</version>
33+
</dependency>
34+
```
35+
36+
We're moving new API features towards APIv2, which is available as:
37+
38+
```xml
39+
<dependency>
40+
<groupId>ovh.uskyblock</groupId>
41+
<artifactId>uSkyBlock-APIv2</artifactId>
42+
<version>3.0.0</version>
43+
</dependency>
44+
```
45+
46+
Feel free to use any of the new APIv2 functions on servers running uSkyBlock 3.0.0+. The old API-methods will
47+
be deprecated and removed in the upcoming plugin releases.
48+
2549
### Bukkit/Spigot 1.7.9/10 Releases
2650

2751
We provide pre-compiled versions (no support) [here](http://rlf.github.io/uSkyBlock):

0 commit comments

Comments
 (0)