Skip to content

Commit f69aed2

Browse files
committed
Merge branch 'dev'
2 parents 76fa634 + e068d3f commit f69aed2

53 files changed

Lines changed: 2017 additions & 311 deletions

Some content is hidden

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

.github/workflows/gitlab-sync.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Sync all branches to GitLab
2+
3+
on:
4+
push:
5+
branches:
6+
- '**' # Any branch
7+
tags:
8+
- "*.*.*" # e.g. 2.2.0
9+
pull_request:
10+
types: [ closed ]
11+
branches: [ '**' ] # Any branch
12+
13+
jobs:
14+
sync:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout all branches
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 0
21+
- name: Push all branches to GitLab
22+
env:
23+
GITLAB_NAMESPACE: pinontmclab/singularitylab
24+
GITLAB_PROJECT: SingularityLib
25+
GITLAB_URL: https://gitlab.com/$GITLAB_NAMESPACE/$GITLAB_PROJECT.git
26+
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
27+
run: |
28+
git remote add gitlab $GITLAB_URL
29+
git push --all https://oauth2:$GITLAB_TOKEN@gitlab.com/$GITLAB_NAMESPACE/$GITLAB_PROJECT.git
30+
git push --tags https://oauth2:$GITLAB_TOKEN@gitlab.com/$GITLAB_NAMESPACE/$GITLAB_PROJECT.git

.github/workflows/publish-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
run: |
6666
git config user.name "github-actions[bot]"
6767
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
68-
git tag "v${{ steps.version.outputs.version }}"
69-
git push origin "v${{ steps.version.outputs.version }}"
68+
git tag "${{ steps.version.outputs.version }}"
69+
git push origin "${{ steps.version.outputs.version }}"
7070
7171
- name: Summary
7272
run: |

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Publish
33
on:
44
push:
55
tags:
6-
- "v*.*.*"
6+
- "*.*.*" # e.g. 2.2.0
77

88
jobs:
99
release:
@@ -20,8 +20,8 @@ jobs:
2020
- name: Derive version from tag
2121
id: rel
2222
run: |
23-
TAG="${GITHUB_REF_NAME}" # e.g. v2.2.0
24-
VERSION="${TAG#v}" # strip leading v
23+
TAG="${GITHUB_REF_NAME}" # e.g. 2.2.0
24+
VERSION="${TAG}" # e.g. VERSION=2.2.0
2525
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
2626
2727
- name: Set up JDK 23 (generate settings.xml)

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# SingularityLib
22

3-
A fork of [ExperienceLib](https://github.com/pinont/ExperienceLib)
3+
[![](https://img.shields.io/github/license/pinont/singularitylib)](https://github.com/Pinont/SingularityLib/blob/main/LICENSE) [![](https://jitpack.io/v/Pinont/SingularityLib.svg)](https://jitpack.io/#Pinont/SingularityLib) [![](https://github.com/Pinont/SingularityLib/actions/workflows/build.yml/badge.svg)](https://github.com/Pinont/SingularityLib/actions/workflows/build.yml)
44

5+
A fork of [ExperienceLib](https://github.com/pinont/ExperienceLib)
56

67
> ## ⚠️ Disclaimer
78
> This project is still in development, so expect some bugs and missing features. If you find any bugs or have any feature requests, please open an issue on the [GitHub repository](https://github.com/Pinont/SingularityLib/issues)
89
9-
[![](https://jitpack.io/v/Pinont/SingularityLib.svg)](https://jitpack.io/#Pinont/SingularityLib) ![GitHub Tag](https://img.shields.io/github/v/tag/pinont/singularitylib)
10-
[![license](https://img.shields.io/github/license/pinont/singularitylib)](https://github.com/Pinont/SingularityLib/blob/main/LICENSE) [![Build & Test (No Deploy)](https://github.com/Pinont/SingularityLib/actions/workflows/build.yml/badge.svg)](https://github.com/Pinont/SingularityLib/actions/workflows/build.yml)
11-
1210
---
1311

1412
A Minecraft plugin api that provides a lot of benefit to develop Minecraft plugin much easier
@@ -51,7 +49,7 @@ If the library is published to GitHub Packages, add the GitHub repository and de
5149

5250
<dependencies>
5351
<dependency>
54-
<groupId>com.github.pinont</groupId>
52+
<groupId>io.github.pinont</groupId>
5553
<artifactId>SingularityLib</artifactId>
5654
<version>Tag</version>
5755
</dependency>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.github.pinont</groupId>
7+
<groupId>io.github.pinont</groupId>
88
<artifactId>singularitylib</artifactId>
9-
<version>2.2.2-SNAPSHOT</version>
9+
<version>2.2.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SingularityLib</name>

src/main/java/com/github/pinont/singularitylib/api/annotation/AutoRegister.java

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

src/main/java/com/github/pinont/singularitylib/api/command/SimpleCommand.java

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

src/main/java/com/github/pinont/singularitylib/api/enums/PersisDataType.java

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

src/main/java/com/github/pinont/singularitylib/api/enums/PlayerInventorySlotType.java

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

src/main/java/com/github/pinont/singularitylib/api/hook/discordJDA/SimpleSlashCommands.java

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

0 commit comments

Comments
 (0)