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.

Sign up for GitHub

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

Jump to bottom

Refactor (v4.0) #376

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

Refactor (v4.0) #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
51eec14
Many changes
ChanceSD Apr 5, 2023
18a300a
More changes
ChanceSD Apr 7, 2023
aebdde7
More more changes
ChanceSD Apr 7, 2023
e027c93
Improved region detection, closes #181
ChanceSD Apr 14, 2024
d6beaf9
Start Java 16 changes
ChanceSD Apr 14, 2024
64b8aa2
More changes
ChanceSD Apr 14, 2024
c327dce
Add option for XP steal, closes #219
ChanceSD Apr 14, 2024
6859612
Move to new package
ChanceSD Apr 30, 2024
9d534b6
Finally discard old package
ChanceSD Apr 30, 2024
99fa154
Handle most IDE warnings
ChanceSD Apr 30, 2024
5c40779
More sonar lint issues solved
ChanceSD May 3, 2024
a34c43b
New message system
ChanceSD May 3, 2024
e3c3c4b
Finish message changes (probably)
ChanceSD May 3, 2024
221df42
Further changes
ChanceSD May 4, 2024
ab6dcd1
Further further changes
ChanceSD May 18, 2024
7a4ad28
Move scheduler code (Closes #518)
ChanceSD Jul 5, 2024
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
12 changes: 3 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.organization>chancesd</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<revision>3.18.18</revision>
<revision>4.0-SNAPSHOT</revision>
</properties>

<distributionManagement>
Expand All @@ -27,7 +27,6 @@

<modules>
<module>pvpmanager</module>
<module>pvpmanager-folia</module>
</modules>

<scm>
Expand All @@ -51,10 +50,6 @@
<allowMajorUpdates>true</allowMajorUpdates>
<allowMinorUpdates>true</allowMinorUpdates>
<allowSnapshots>true</allowSnapshots>
<excludes>
<exclude>com.massivecraft:FactionsUUID</exclude>
<exclude>com.massivecraft:MassiveCore</exclude>
</excludes>
</configuration>
<phase>post-clean</phase>
<goals>
Expand All @@ -75,9 +70,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<optimize>true</optimize>
<source>17</source>
<target>17</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
Expand Down
36 changes: 0 additions & 36 deletions pvpmanager-folia/pom.xml
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions pvpmanager-folia/src/main/java/me/chancesd/pvpmanager/utils/FoliaProvider.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions pvpmanager-folia/src/main/java/me/chancesd/pvpmanager/utils/SchedulerProvider.java
View file
Open in desktop

This file was deleted.

74 changes: 51 additions & 23 deletions pvpmanager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<version>${revision}</version>
</parent>

<groupId>me.NoChance.PvPManager</groupId> <!--keep this groupid for now while the java package isn't changed -->
<artifactId>pvpmanager</artifactId>
<packaging>jar</packaging>

Expand Down Expand Up @@ -59,6 +58,12 @@
<url>https://repo.md-5.net/content/groups/public/</url>
</repository>

<!-- TAB -->
<repository>
<id>krypton</id>
<url>https://repo.kryptonmc.org/releases</url>
</repository>

<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public</url>
Expand Down Expand Up @@ -121,6 +126,19 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- SimpleClans -->
<dependency>
<groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
Expand Down Expand Up @@ -202,6 +220,14 @@
</exclusions>
</dependency>

<!-- TAB -->
<dependency>
<groupId>me.neznamy</groupId>
<artifactId>tab-api</artifactId>
<version>4.0.2</version>
<scope>provided</scope>
</dependency>

<!-- Towny -->
<dependency>
<groupId>com.github.TownyAdvanced</groupId>
Expand Down Expand Up @@ -232,24 +258,13 @@
<scope>provided</scope>
</dependency>

<!-- Database -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>4.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.46.0.0</version>
<scope>test</scope>
</dependency>
<!-- GriefPrevention -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId>
<version>16.14.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Unit Tests -->
Expand All @@ -271,17 +286,30 @@
<version>5.12.0</version>
<scope>test</scope>
</dependency>

<!-- Internal -->
<dependency>
<groupId>me.chancesd.pvpmanager</groupId>
<artifactId>pvpmanager-folia</artifactId>
<version>${revision}</version>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.45.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<scope>test</scope>
</dependency>

<!-- Internal -->
<dependency>
<groupId>me.chancesd.sdutils</groupId>
<artifactId>sdutils</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
31 changes: 0 additions & 31 deletions pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPOverride.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPStatus.java
View file
Open in desktop

This file was deleted.

Loading