Skip to content

Commit

Permalink
#patch Added 1.20.2 support, SEPARATE_ARENA_SPECTATORS, kits.yml earl…
Browse files Browse the repository at this point in the history 
…y mechanic | Fixed player chat issue & more (#32)

* Bump version from 1.3.1 to 1.3.1-SNAPSHOT0

* Fixed doubled statistics, which result in 0 placeholders

* Bump version from 1.3.1-SNAPSHOT0 to 1.3.1-SNAPSHOT1

* Bump version from 1.3.2 to 1.3.2-SNAPSHOT0

* Fixed bossbar did not disable (config option)

* added default poms for maven building

* Bump version from 1.3.2-SNAPSHOT0 to 1.3.2-SNAPSHOT1

* fixed rewards enabling

* Bump version from 1.3.2-SNAPSHOT1 to 1.3.2-SNAPSHOT2

* Fixed locale registration if services are unavailable

* fixed version

* Bump version from 1.3.2-SNAPSHOT2 to 1.3.2-SNAPSHOT3

* Added SEPARATE_ARENA_SPECTATORS

* Bump version from 1.3.2-SNAPSHOT3 to 1.3.2-SNAPSHOT4

* Fixed NPE on command usage /pluginindicator stop

* Bump version from 1.3.2-SNAPSHOT4 to 1.3.2-SNAPSHOT5

* Support 1.20.2

* Bump version from 1.3.2-SNAPSHOT5 to 1.3.2-SNAPSHOT6

* prepared kits.yml file upgrade

* Bump version from 1.3.2-SNAPSHOT6 to 1.3.2-SNAPSHOT7

* Kit editing  (#31)

* feat: added setIfAbsent method to ConfigUtils

* Minor kit update.

* feat: kits config foundation

* Revert "feat: kits config foundation"

This reverts commit 90b140d.

* Java 8 compactible

* Resolved 1 review.

#31 (comment)

* Removed 1 unnecessary method.

* Moved initialize kit config to after checking if kit is enabled.

* Reformatted code

* Removed setting name to the config file

* Reformatted inventory section of configuration file for kits.yml

* Reformatted armour section of configuration file for kits.yml

* Added kit item handling, allowing items to be changed while giving kit items.

* Update .gitignore

* Updated snapshot version

* Removed Kit.restock() method.

* Removed Kit.restock() method.

* Fix for a NPE

* Fix for another NPE

* Fix for another another NPE

* Bumped snapshot version

* Update MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/basekits/Kit.java

Co-authored-by: montlikadani <[email protected]>

* Update for level kits.

* Updated structure of kit loading and handling

* Fixed getting the itemstack on display for the kit menu

* Fixed default kit

* Fixed clone kit

* Merged suggestion on key_name.

Co-authored-by: montlikadani <[email protected]>

* Restructured code

* Updated KitMenuHandler.java

* Updated version

* Modified how KitRegistry.handleItem is used.

* Create HandleItem.java

* Modified handleitem interface

* Fixed optional configuration values

* Update MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/kits/KitRegistry.java

Co-authored-by: montlikadani <[email protected]>

---------

Co-authored-by: montlikadani <[email protected]>
Co-authored-by: Tigerpanzer_02 <[email protected]>

* Bump version from 1.3.2-SNAPSHOT13 to 1.3.2-SNAPSHOT14

* Added method to move full hologramarmorstand

* Bump version from 1.3.2-SNAPSHOT14 to 1.3.2-SNAPSHOT15

* Fixed kits startup issues

* Added kits description

* Added KitAction NO_AMOUR

* Fixed kit name and lore on kitmenu

* Fixed colour on KitMenuItems

* Bump version from 1.3.2-SNAPSHOT15 to 1.3.2-SNAPSHOT16

* Fixed player name on chat is removed while PAPI enabled

* Bump version from 1.3.2-SNAPSHOT16 to 1.3.2-SNAPSHOT17

* Fixed SelectKitArgument showing for plugins without kits

* Bump version from 1.3.2-SNAPSHOT17 to 1.3.2-SNAPSHOT18

* Moved KitAction to KitAbility

* Added kit restock method, should be used with optional configuration

* Allow plugin specific KitAbilities
Added KitAbilityManager
Added ArmorHelper.getArmorTypes

* Bump version from 1.3.2-SNAPSHOT18 to 1.3.2-SNAPSHOT19

* Renamed actions to abilities in kits.yml

* Bump version from 1.3.2-SNAPSHOT19 to 1.3.2-SNAPSHOT20

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
Co-authored-by: Wanbin Cao <[email protected]>
Co-authored-by: montlikadani <[email protected]>
  • Loading branch information
@Tigerpanzer02 @Lagggpixel @montlikadani
4 people authored Nov 29, 2023
1 parent 43f5c24 commit 13c9675
Show file tree
Hide file tree
Showing 39 changed files with 1,585 additions and 343 deletions.
33 changes: 32 additions & 1 deletion .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,33 @@
### 1.3.3 Release (16.10.2023)
* Added 1.20.2 support
* Added kits.yml mechanic
* Added SEPARATE_ARENA_SPECTATORS to adjust the chat for spectators to be on there own
* Changed config value Separate-Arena-Chat to Chat.Separate.Arena
* Fixed rewards enabling
* Fixed bossbar disable
* Fixed locale registration if services are unavailable
* Fixed player name on chat is removed while PAPI enabled
* Fixed NPE on command usage /pluginindicator stop

### 1.3.2 Release (09.08.2023)
* Fixed placeholders of core statistics found on StatisticType
* Fixed placeholders of core statistics found on StatisticType

### 1.0.0 Initial Release (2023)
* Added paged fast inv
* Added some more methods to itembuilder
* Refactored code
* It's now possible to configure more arena timings such as shorten waiting and restarting
* Powerups don't need HolographicDisplays anymore
* language.properties files are depreciated and all files are now yml
* General file overhaul
* Specialitems can now have rewards and permissions
* Its possible to add own specialitems on different stages
* Refactored messages and language.yml
* Removed some static methods
* Made it plugin unspecific to allow the core to work on its own with variables
* Added arena timer placeholder
* All stat placeholder will now automatically also registered with papi
* Added permissions.yml with custom permissions such as exp boost
* Refactored spectator gui to match functions from hypixel
(speed, nightvision, auto teleport, first person mode, visibility)
* Its possible to add more items into spectator settings menu (own permissions and commands supported)
226 changes: 226 additions & 0 deletions .github/maven/classic/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ MiniGamesBox - Library box with massive content that could be seen as minigames core.
~ Copyright (C) 2023 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/>.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.2-java8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>MiniGamesBox-Classic</artifactId>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<repositories>
<repository>
<id>mojang-repo</id>
<url>https://libraries.minecraft.net/</url>
</repository>
<repository>
<id>simonsators-repo</id>
<url>https://simonsator.de/repo/</url>
</repository>
<repository>
<id>alessiodp-repo</id>
<url>https://repo.alessiodp.com/releases/</url>
</repository>
<repository>
<id>plugilyprojects-repo</id>
<url>https://maven.plugily.xyz/releases</url>
</repository>
<repository>
<id>papi-repo</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>2.3.31</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.tigerhix.lib</groupId>
<artifactId>scoreboard</artifactId>
<version>1.4.0</version>
<scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>9.4.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>DevelopmentPAFSpigot</artifactId>
<version>1.0.67</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Party-and-Friends-MySQL-Edition-Spigot-API</artifactId>
<version>1.5.4-RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Spigot-Party-API-For-RedisBungee</artifactId>
<version>1.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alessiodp.parties</groupId>
<artifactId>parties-api</artifactId>
<version>3.2.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>MiniGamesBox-Inventory</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>MiniGamesBox-Utils</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>plugily.projects</groupId>
<artifactId>MiniGamesBox-Database</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<scope>compile</scope>
</dependency>
<!-- Paper Lib-->
<dependency>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
<version>1.0.7</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<windowtitle>MiniGamesBox Classic API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
<destDir>minecraft/minigamesbox/classic</destDir>
<isOffline>false</isOffline>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries.particles</pattern>
<shadedPattern>plugily.projects.minigamesbox.classic.utils.version.xseries</shadedPattern>
</relocation>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>plugily.projects.minigamesbox.classic.utils.version.xseries</shadedPattern>
</relocation>
<relocation>
<pattern>me.tigerhix.lib.scoreboard</pattern>
<shadedPattern>plugily.projects.minigamesbox.classic.utils.scoreboard</shadedPattern>
</relocation>
<relocation>
<pattern>fr.mrmicky.fastinv</pattern>
<shadedPattern>plugily.projects.minigamesbox.inventory.utils.fastinv</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>plugily.projects.minigamesbox.classic.utils.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>io.papermc.lib</pattern>
<shadedPattern>plugily.projects.minigamesbox.classic.utils.paperlib</shadedPattern>
</relocation>
</relocations>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
</extension>
</extensions>
</build>
</project>
71 changes: 71 additions & 0 deletions .github/maven/database/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ MiniGamesBox - Library box with massive content that could be seen as minigames core.
~ Copyright (C) 2023 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/>.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>minigamesbox</artifactId>
<groupId>plugily.projects</groupId>
<version>1.3.2-java8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>MiniGamesBox-Database</artifactId>


<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencies>
<!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>4.0.3</version>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<windowtitle>MiniGamesBox Inventory API docs for v${project.version}</windowtitle>
<description>Library box with massive content that could be seen as minigames core.</description>
<destDir>minecraft/minigamesbox/inventory</destDir>
<isOffline>false</isOffline>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.5.2</version>
</extension>
</extensions>
</build>
</project>
Loading

0 comments on commit 13c9675

Please sign in to comment.