Skip to content

Commit

Permalink
Merge branch 'development' into resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tigerpanzer02
Tigerpanzer02 authored Aug 8, 2023
2 parents fe27a93 + 1be6dc3 commit e8192b4
Show file tree
Hide file tree
Showing 166 changed files with 4,735 additions and 12,462 deletions.
18 changes: 18 additions & 0 deletions .checkstyle/checkstyle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
<?xml version="1.0"?>

<!--
~ MurderMystery - Find the murderer, kill him and survive!
~ Copyright (c) 2022 Plugily Projects - maintained by Tigerpanzer_02 and contributors
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<!--
~ Murder Mystery is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md → .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
### 2.0.0 Release (08.08.2023)
* Added up to 1.20 compatibility
* Added sword skins.yml
* Added trails.yml
* Changed supported languages [https://translate.plugily.xyz]
* Changed plugin base is based on MinigamesCore [https://github.com/Plugily-Projects/MiniGamesBox]
* Changed native java building to java17, java 8 downloadable on our discord [https://discord.plugily.xyz]
* Fixed all known bugs

### 1.8.0 Release (05.08.2021 - 2022)
* Improved leaderboard command
* Added murderer and detective chance placeholders to scoreboard
* Now weather changing will be cancelled when a game is running
* Now users can use placeholderapi placeholders in bossbar, titles, without player specified
* Added option to determine if the deletion of arena needs confirmation or not

### 1.7.9 Release (30.05.2021 - 01.08.2021)
* Added forcestart item
* Added murderer and detective pass (Command and Item to activate)
Expand Down
0 CONTRIBUTORS.md → .github/CONTRIBUTORS.md
View file
File renamed without changes.
0 LICENSE.md → .github/LICENSE.md
View file
File renamed without changes.
34 changes: 23 additions & 11 deletions .github/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,43 @@
![](https://images.plugily.xyz/banner/display.php?id=MurderMystery)

# Murder Mystery [![](https://img.shields.io/badge/javadocs-latest-red.svg)](https://jd.plugily.xyz/apidocs/minecraft/murdermystery/) [![](https://img.shields.io/badge/wiki-click-blue.svg)](https://wiki.plugily.xyz/murdermystery/) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Plajer-Lair_MurderMystery&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Plajer-Lair_MurderMystery) [![Discord](https://img.shields.io/discord/345628548716822530.svg?color=7289DA&label=discord)](https://discord.gg/UXzUdTP)
Murder Mystery is a Minecraft minigame designed for small and big servers. This minigame is unique and very configurable, 100% free and open source!
# Murder Mystery [![Maven Repository](https://maven.plugily.xyz/api/badge/latest/releases/plugily/projects/murdermystery?color=40c14a&name=Maven&prefix=v)](https://maven.plugily.xyz/#/releases/plugily/projects/murdermystery) [![JavaDoc Repository](https://maven.plugily.xyz/api/badge/latest/releases/plugily/projects/murdermystery?color=40c14a&name=JavaDoc&prefix=v)](https://maven.plugily.xyz/javadoc/releases/plugily/projects/murdermystery/latest) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Plugily-Projects_MurderMystery&metric=sqale_rating)](https://sonarcloud.io/summary/overall?id=Plugily-Projects_MurderMystery) [![Discord](https://img.shields.io/discord/345628548716822530.svg?color=7289DA&style=for-the-badge&logo=discord)](https://discord.plugily.xyz) [![Patreon]( https://img.shields.io/badge/Patreon-F96854?style=for-the-badge&logo=patreon&logoColor=white)](https://patreon.com/plugily)

Be the murderer and kill everyone in the game! Beware of the detective and armored innocents! As a detective you must kill the murderer and protect as much innocents as you can!
Murder Mystery is a Minecraft minigame designed for small and big servers. This minigame is unique and very
configurable, 100% free and open source!

Be the murderer and kill everyone in the game! Beware of the detective and armored innocents! As a detective you must
kill the murderer and protect as much innocents as you can!
As an innocent you must just survive till the end!

Have fun using it! Leave a good rating if you really like it.

## Want to contribute in this project?
[**💣 Issues Reporting (Discord)**](https://discordapp.com/invite/UXzUdTP)        [**❤ Make Donation**](https://www.paypal.me/plugilyprojects)

[**💣 Issues Reporting (Discord)**](https://discordapp.com/invite/UXzUdTP)
[**❤ Make Donation**](https://www.paypal.me/plugilyprojects)

# Credits

## Open Source Libraries
| Library | Author | License |
|-------------------------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------|
| [InventoryFramework](https://github.com/stefvanschie/IF/) | [stefvanschie](https://github.com/stefvanschie) | [Unlicense](https://github.com/stefvanschie/IF/blob/master/LICENSE) |
| [ScoreboardLib](https://github.com/TigerHix/ScoreboardLib/) | [TigerHix](https://github.com/TigerHix) | [LGPLv3](https://github.com/TigerHix/ScoreboardLib/blob/master/LICENSE) |
| [HikariCP](https://github.com/brettwooldridge/HikariCP) | [brettwooldridge](https://github.com/brettwooldridge) | [Apache License 2.0](https://github.com/brettwooldridge/HikariCP/blob/dev/LICENSE) |
| [bStats](https://github.com/Bastian/bStats-Metrics) | [Bastian](https://github.com/Bastian) | [LGPLv3](https://github.com/Bastian/bStats-Metrics/blob/master/LICENSE) |
| [Commons Box](https://github.com/Plajer/Commons-Box) | [Plajer](https://github.com/Plajer) | [GPLv3](https://github.com/Plajer/Commons-Box/blob/master/LICENSE.md) |

| Library | Author | License |
|------------------------------------------------------------------|--------------------------------------------------------|------------------------------------------------------------------------------------|
| [ScoreboardLib](https://github.com/TigerHix/ScoreboardLib/) | [TigerHix](https://github.com/TigerHix) | [LGPLv3](https://github.com/TigerHix/ScoreboardLib/blob/master/LICENSE) |
| [HikariCP](https://github.com/brettwooldridge/HikariCP) | [brettwooldridge](https://github.com/brettwooldridge) | [Apache License 2.0](https://github.com/brettwooldridge/HikariCP/blob/dev/LICENSE) |
| [bStats](https://github.com/Bastian/bStats-Metrics) | [Bastian](https://github.com/Bastian) | [LGPLv3](https://github.com/Bastian/bStats-Metrics/blob/master/LICENSE) |
| [Commons Box](https://github.com/Plajer/Commons-Box) | [Plajer](https://github.com/Plajer) | [GPLv3](https://github.com/Plajer/Commons-Box/blob/master/LICENSE.md) |
| [MiniGamesBox](https://github.com/Plugily-Projects/MiniGamesBox) | [Plugily Projets](https://github.com/Plugily-Projects) | [GPLv3](https://github.com/Plugily-Projects/MiniGamesBox/blob/master/LICENSE.md) |

## Open Source Licenses

#### Code Whale

<img src="https://poeditor.com/public/images/logo/logo_head_500_transparent.png" alt="jetbrains logo" width="150"/>

Thanks to Code Whale for Open Source license for POEditor project.

## Contributors

This section will be updated soon

<img align="right" src="https://i.imgur.com/BAHeLR2.png">
Expand Down
157 changes: 26 additions & 131 deletions pom.xml → .github/maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ MurderMystery - Find the murderer, kill him and survive!
~ Copyright (C) 2020 Plugily Projects - maintained by Tigerpanzer_02, 2Wild4You and contributors
~ Copyright (c) 2022 Plugily Projects - maintained by Tigerpanzer_02 and contributors
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@

<groupId>plugily.projects</groupId>
<artifactId>murdermystery</artifactId>
<version>1.7.9</version>
<version>2.0.0-java8-snapshot</version>
<name>MurderMystery</name>

<properties>
Expand All @@ -47,25 +47,21 @@
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>papi-repo</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>plugilyprojects</id>
<url>https://maven.plugily.xyz/</url>
<url>https://maven.plugily.xyz/releases</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<id>plugilyprojects-snapshots</id>
<url>https://maven.plugily.xyz/snapshots</url>
</repository>
<repository>
<id>simonsators-repo</id>
<url>http://simonsator.de/repo/</url>
<id>jitpack</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>alessiodp-repo</id>
<url>https://repo.alessiodp.com/releases/</url>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
</repository>
<repository>
<id>spigot-repo</id>
Expand All @@ -77,63 +73,14 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>commons-box-classic</artifactId>
<version>1.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>commons-box-database</artifactId>
<version>1.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>commons-box-minecraft</artifactId>
<version>1.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.tigerhix.lib</groupId>
<artifactId>scoreboard</artifactId>
<version>1.0.9</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>plugily.projects.inventoryframework</groupId>
<artifactId>IF</artifactId>
<version>0.10.0</version>
<scope>compile</scope>
<classifier>legacy-jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alessiodp.parties</groupId>
<artifactId>parties-api</artifactId>
<version>3.1.0</version>
<version>1.19.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bstats/bstats-bukkit -->
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>21.0.1</version>
<version>23.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -144,48 +91,11 @@
<systemPath>${project.basedir}/lib/CorpseReborn.jar</systemPath>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.10.0</version>
<groupId>plugily.projects</groupId>
<artifactId>MiniGamesBox-Classic</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>partyandfriends</artifactId>
<version>1.0.52</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/PAFSpigot.jar</systemPath>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Party-and-Friends-MySQL-Edition-Spigot-API</artifactId>
<version>1.3.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>be.maximvdw</groupId>
<artifactId>MVdWPlaceholderAPI</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Spigot-Party-API-For-RedisBungee</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
</dependencies>
<build>
Expand All @@ -199,12 +109,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<goals>
<goal>compile</goal>
</goals>
Expand All @@ -216,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<configuration>
<windowtitle>Murder Mystery API docs for v${project.version}</windowtitle>
<description>Minecraft survival minigame.
Expand All @@ -230,12 +140,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -244,27 +154,18 @@
</goals>
<configuration>
<relocations>
<relocation>
<pattern>plugily.projects.inventoryframework</pattern>
<shadedPattern>plugily.projects.murdermystery.utils.inventoryframework
</shadedPattern>
</relocation>
<relocation>
<pattern>com.zaxxer.hikari</pattern>
<shadedPattern>plugily.projects.murdermystery.database.hikari</shadedPattern>
</relocation>
<relocation>
<pattern>me.tigerhix.lib.scoreboard</pattern>
<shadedPattern>plugily.projects.murdermystery.utils.scoreboard</shadedPattern>
<pattern>plugily.projects.minigamesbox</pattern>
<shadedPattern>plugily.projects.murdermystery.minigamesbox</shadedPattern>
</relocation>
<relocation>
<pattern>plugily.projects.commonsbox</pattern>
<shadedPattern>plugily.projects.murdermystery.commonsbox</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>plugily.projects.murdermystery.utils.bstats</shadedPattern>
</relocation>
</relocations>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
Expand All @@ -286,22 +187,16 @@
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>3.4.3</version>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
</extension>
</extensions>
</build>

<distributionManagement>
<repository>
<id>plugily-projects-repo</id>
<url>ftp://81.19.211.8</url>
<id>plugily-projects</id>
<url>https://maven.plugily.xyz/releases</url>
</repository>
<site>
<id>plugily-projects-java-docs</id>
<name>murdermystery</name>
<url>ftp://81.19.211.8</url>
</site>
</distributionManagement>

</project>
Loading

0 comments on commit e8192b4

Please sign in to comment.