Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.2.0-SNAPSHOT Release to Master #89

Merged
merged 31 commits into from
May 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1068c22
Fix apache commons bundling with plugin
HeroGamers Jan 5, 2023
e0f0133
Change spigot version
HeroGamers Jan 5, 2023
025d7d7
Update to 1.19.4
HeroGamers May 26, 2023
eb0110d
Move tasks to seperate package
HeroGamers May 26, 2023
9a4a9d6
Formatting
HeroGamers May 26, 2023
dc67385
Closes #61
HeroGamers May 26, 2023
780082d
Don't teleport entities in async thread - closes #52
HeroGamers May 26, 2023
d33dfc7
Deny dogs from teleporting through portals, if teleporting is enabled…
HeroGamers May 26, 2023
db47866
Closes #60
HeroGamers May 26, 2023
c5de575
Fixes #76
HeroGamers May 26, 2023
65ee87c
Make it easier to see that you can release dead dogs - closes #77
HeroGamers May 26, 2023
bd14aba
Update README
HeroGamers May 26, 2023
8af3661
Update README
HeroGamers May 26, 2023
8c17992
Add issue templates - kudos to EssentialsX as I used that for inspira…
HeroGamers May 26, 2023
5d1e3ca
Forgot to change the issues link
HeroGamers May 26, 2023
b88748b
Add a sit and stand command - closes #22
HeroGamers May 26, 2023
60cb4c5
Merge pull request #83 from HeroGamers/sit-command-22
HeroGamers May 26, 2023
083b269
Add Sonar to GitHub Actions CI
HeroGamers May 26, 2023
2fbf4af
Revive using levels, closes #79
HeroGamers May 26, 2023
375439e
Merge pull request #84 from HeroGamers/revive-levels-79
HeroGamers May 26, 2023
df58af8
Add lifesteal and fix setlevel command; closes #59
HeroGamers May 27, 2023
d1d9b82
Merge pull request #85 from HeroGamers/lifesteal-59
HeroGamers May 27, 2023
94d235d
Expand comehere command to be able to affect all dogs; closes #51
HeroGamers May 27, 2023
a59d1f1
Add limits to dogs owned using permissions; closes #40
HeroGamers May 28, 2023
7dc2b91
Merge pull request #86 from HeroGamers/dog-limits-40
HeroGamers May 28, 2023
77c3a0b
Add petting dogs; closes #32
HeroGamers May 28, 2023
dbb5855
Merge pull request #87 from HeroGamers/pet-dogs-32
HeroGamers May 28, 2023
aae2f68
Health format in list
HeroGamers May 28, 2023
131291b
Implement trading of dogs between players; closes #28
HeroGamers May 29, 2023
886cb2f
Merge pull request #88 from HeroGamers/trade-dogs-28
HeroGamers May 29, 2023
4190051
Change release to 0.2.0-SNAPSHOT
HeroGamers May 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Discord Server
url: discord.gg/PvFPEfd
about: Personal Discord server, but you are welcome to join to discuss features or bugs.
72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/report-a-bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Report bug
description: Report a bug in MyDog.
labels: 'bug'
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to report a MyDog bug! Fill out the form below to provide us with info to help fix the bug.
Only use this if you're 100% sure you've found a bug and can reproduce it. If you're looking for general help with MyDog, try reaching out to me on Discord or Spigot's Discord Server.
- type: dropdown
attributes:
label: Type of bug
description: What type of bug is this? Choose all that apply.
multiple: true
options:
- Performance issue or memory leak
- Data loss
- Exploit
- Compatibility issue
- Error in console
- Other unexpected behaviour
validations:
required: true

- type: input
attributes:
label: Error log (if applicable)
description: If you are reporting a console error, upload any relevant log excerpts to either https://paste.gg or https://gist.github.com, save and the paste the link in this box. If you included those files in the same paste as your startup log, paste the same link here.
placeholder: "Example: https://paste.gg/p/anonymous/742cfe1a62b14a3fa34c566fb441c457"

- type: textarea
attributes:
label: Bug description
description: Describe roughly what the bug is here.
placeholder: |
Example: "When running `/md revive` the dog is still not revived..."
validations:
required: true
- type: textarea
attributes:
label: Steps to reproduce
description: Provide an example of how to trigger the bug.
placeholder: |
Example:
1. Get a dog
2. Have the dog die (ohno)
3. Run `/md revive`
validations:
required: true
- type: textarea
attributes:
label: Expected behaviour
description: Explain what you should expect to happen.
placeholder: |
Example: "The good boy should appear again!"
validations:
required: true
- type: textarea
attributes:
label: Actual behaviour
description: Explain what actually happens.
placeholder: |
Example: "The good boy is still gone :("
validations:
required: true

- type: markdown
attributes:
value: |
In the text box below, you can attach any relevant screenshots, files and links to Timings/spark profiler reports.
You can also include a link to a heapdump if necessary, but please make sure you don't include any private player data in the heapdump.
If you suspect this issue is related to a prior issue/PR/commit, please mention it here.
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/request-a-feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Request a feature
description: Suggest a feature you want to see in MyDog!
labels: 'enhancement'
body:
- type: markdown
attributes:
value: |
If you have a feature suggestion for MyDog, read the following tips:
1. Fill out the template.
This will help us understand what you're requesting and why you want us
to add it.
2. Keep it simple.
Make sure it's easy to understand what you're requesting. A good way is
to keep it to one request per GitHub issue, as we can then easily track
feature requests.
3. Check whether it has already been asked or added.
You can search the issue tracker to see if your feature has already been
requested at https://github.com/HeroGamers/MyDog/issues. You can
also check the changelogs to see if the feature was recently added:
https://github.com/HeroGamers/MyDog/releases
4. Ask yourself: "Does this belong in MyDog?"
If your feature is very specific or already exists in another plugin,
it might not be a good fit for MyDog.
- type: textarea
attributes:
label: Feature description
description: Explain what you should expect to happen.
placeholder: |
What feature are you suggesting?
validations:
required: true
- type: textarea
attributes:
label: How the feature is useful
description: Explain what actually happens.
placeholder: |
How is the feature useful to players, server owners and/or developers?
validations:
required: true
4 changes: 2 additions & 2 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
packages: write

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'adopt'
Expand Down
69 changes: 57 additions & 12 deletions .github/workflows/maven-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,48 @@
name: Maven Test

on:
push
push:
branches:
- master
- dev
pull_request:
types: [ opened, synchronize, reopened ]

jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17
cache: 'maven'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file

- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build with Maven and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=HeroGamers_MyDog --file pom.xml

compatability:
runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -17,15 +55,22 @@ jobs:

name: Java ${{ matrix.java }} build
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'maven'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'maven'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file

- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build with Maven
run: mvn -B test --file pom.xml
- name: Build with Maven
run: mvn -B verify --file pom.xml
32 changes: 12 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,20 @@ before_install:
- echo "Setting project environment variable."
- export TRAVIS_REPO_OWNER=${TRAVIS_REPO_SLUG%/*}
- export TRAVIS_REPO_NAME=${TRAVIS_REPO_SLUG#*/}
deploy:
provider: releases
api-key:
secure: ORbcFGH2yOAsutJzOzh62hAeC12kV935ctL1Gg6MvsoSOaRBasoQkDdGRfm6NVi2rYIsEBDR3vAYplF3AOiU6/7W4vqSFDm5xp2G4Mf2xg0wSRvWQR57SJ4CJopa6ZTYQGUQJ4MklDSUnZcOLA/SGrmoOG7ioRITs0LFvn9lS3vAO35RH030DfPSW4Luy5+FKlDubulUJPlYn0cr5N+00wYOifOwee5BAdM6ajm/LgZItaGWfZuNUI0iQwCutcLPWQrI0RXO+wpDv8XqEQoaIhyAPCEcuZSrzt0ltVVFkW5YtNcWKgEAJdh4LYZSyWQCqZlzSLTqbMqvQ9RrxVeY3mNAPcuxrf3yt5nRqshRZdcTA1OX2uMKNPFfrB6CkEhAm+Cy9yD62EPM24t24Q+8mLMm+x0jJ1ZJtTOcC+gq3yC86b57OS2BaytbEWHE/u915XnMpl5HjdauTc8QbuzDMxqRWnumDX2eEg35ZDldZ7OsOg4by9eE221BQlhHM8t820Oj0byCPDvIpITNaBjeOihq9xVO7BIaR+kt/0txB1kjHgCMLtA45GaRRIDG2VfMY9kVVcVlrT/7xf3xgL7ktYQNi9roQaxzJ5gInWcpecpqG54Ncf4dQtMXW+Gwl4pCJYJEJNz5ciptdqqfDJ9Je4nApaMnAIJJ7tGc6/HLV0E=
file_glob: true
file: target/MyDog-*.jar
skip_cleanup: true
on:
repo: DoggyCraftDK/MyDog
tags: true
#deploy:
# provider: releases
# api-key:
# secure:
# file_glob: true
# file: target/MyDog-*.jar
# skip_cleanup: true
# on:
# repo: HeroGamers/MyDog
# tags: true
sudo: false
after_success:
- wget https://www.doggycraft.dk/travis/send.sh
- chmod +x send.sh
- ./send.sh success $WEBHOOK_URL
after_failure:
- wget https://www.doggycraft.dk/travis/send.sh
- chmod +x send.sh
- ./send.sh failure $WEBHOOK_URL
addons:
sonarcloud:
organization: "doggycraftdk"
organization: "herogamers"

script:
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=DoggyCraftDK_MyDog
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=HeroGamers_MyDog
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<h1 align="center">MyDog</h1>
<div align="center">

[![Build Status](https://travis-ci.com/DoggyCraftDK/MyDog.svg?branch=master)](https://travis-ci.com/DoggyCraftDK/MyDog)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=DoggyCraftDK_MyDog&metric=alert_status)](https://sonarcloud.io/dashboard?id=DoggyCraftDK_MyDog)
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=DoggyCraftDK_MyDog&metric=ncloc)](https://sonarcloud.io/dashboard?id=DoggyCraftDK_MyDog)
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=DoggyCraftDK_MyDog&metric=bugs)](https://sonarcloud.io/dashboard?id=DoggyCraftDK_MyDog)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=DoggyCraftDK_MyDog&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=DoggyCraftDK_MyDog)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=DoggyCraftDK_MyDog&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=DoggyCraftDK_MyDog)
[![Maven Test](https://github.com/HeroGamers/MyDog/actions/workflows/maven-test.yml/badge.svg)](https://github.com/HeroGamers/MyDog/actions/workflows/maven-test.yml)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=HeroGamers_MyDog&metric=alert_status)](https://sonarcloud.io/dashboard?id=HeroGamers_MyDog)
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=HeroGamers_MyDog&metric=ncloc)](https://sonarcloud.io/dashboard?id=HeroGamers_MyDog)
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=HeroGamers_MyDog&metric=bugs)](https://sonarcloud.io/dashboard?id=HeroGamers_MyDog)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=HeroGamers_MyDog&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=HeroGamers_MyDog)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=HeroGamers_MyDog&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=HeroGamers_MyDog)
</div>

Tamed wolves but at least 10x better.
Expand All @@ -26,10 +26,10 @@ ___
* The ability to add currently existing Tamed Wolves to the MyDog system, and register them as new Dogs (interact with them).
* Configurable all the way from the sound on LevelUp to the messages displayed (excluding error messages for now...)

### TODO Feature-list
* Add inventory to Dogs, so they can wear armor and take less damage.
* Config with customizable experience values for entities.
* For the full list, visit the [TODO list](https://github.com/DoggyCraftDK/MyDog/projects/1).
### ToDo Feature-list
To view the list of features, please visit the [project page](https://github.com/users/HeroGamers/projects/1).

For new feature requests, please open a GitHub Issue.

## Resources
* Resource page on [Spigot](https://www.spigotmc.org/resources/mydog.70260/).
Expand Down Expand Up @@ -76,4 +76,4 @@ mydog.save:
```

## Bug reports and issues
Visit the [Issues Tab](https://github.com/DoggyCraftDK/MyDog/issues).
Visit the [Issues Tab](https://github.com/HeroGamers/MyDog/issues).
18 changes: 8 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>dk.fido2603</groupId>
<artifactId>mydog</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<name>MyDog</name>
<description>Tamed wolves but at least 10x better!</description>
<url>https://github.com/${github.repo}</url>

<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/DoggyCraftDK/MyDog/master/LICENSE</url>
<url>https://raw.githubusercontent.com/HeroGamers/MyDog/master/LICENSE</url>
</license>
</licenses>

<properties>
<github.repo>DoggyCraft/MyDog</github.repo>
<bukkitAPIVersion>1.19.2-R0.1-SNAPSHOT</bukkitAPIVersion>
<github.repo>HeroGamers/MyDog</github.repo>
<bukkitAPIVersion>1.19.4-R0.1-SNAPSHOT</bukkitAPIVersion>
<jdk.version>8</jdk.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.release>${jdk.version}</maven.compiler.release>
Expand All @@ -26,11 +26,8 @@
<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>

<!-- Sonar -->
<sonar.host.url>http://localhost:9000/</sonar.host.url>
<!--suppress UnresolvedMavenProperty -->
<sonar.dependencyCheck.reportPath>${dependency.check.report.dir}/dependency-check-report.xml</sonar.dependencyCheck.reportPath>
<!--suppress UnresolvedMavenProperty -->
<sonar.dependencyCheck.htmlReportPath>${dependency.check.report.dir}/dependency-check-report.html</sonar.dependencyCheck.htmlReportPath>
<sonar.organization>herogamers</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>

<scm>
Expand Down Expand Up @@ -71,14 +68,15 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<!-- apache commons lang -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
Loading