Skip to content

Commit 0ca8196

Browse files
Peashooter101Peashooter101
committed
Setup for Multi-Platform
Created modules for paper and fabric platforms Paper is functional on maven package Code is not refactored to common yet, common empty
1 parent 7a528df commit 0ca8196

40 files changed

Lines changed: 324 additions & 218 deletions

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ target/
2626
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2727
hs_err_pid*
2828
replay_pid*
29-
SimplePMs.iml
29+
*.iml

‎common/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>simplexity.simplepms</groupId>
8+
<artifactId>common</artifactId>
9+
<version>2.4.2</version>
10+
11+
<parent>
12+
<groupId>simplexity</groupId>
13+
<artifactId>SimplePMs</artifactId>
14+
<version>2.4.2</version>
15+
</parent>
16+
17+
<build>
18+
<finalName>${project.parent.artifactId}-${project.artifactId}-${project.version}</finalName>
19+
</build>
20+
21+
<properties>
22+
<maven.compiler.source>21</maven.compiler.source>
23+
<maven.compiler.target>21</maven.compiler.target>
24+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
</properties>
26+
27+
</project>

‎fabric/pom.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>simplexity.simplepms</groupId>
8+
<artifactId>fabric</artifactId>
9+
<version>2.4.2</version>
10+
11+
<parent>
12+
<groupId>simplexity</groupId>
13+
<artifactId>SimplePMs</artifactId>
14+
<version>2.4.2</version>
15+
</parent>
16+
17+
<build>
18+
<finalName>${project.parent.artifactId}-${project.artifactId}-${project.version}</finalName>
19+
</build>
20+
21+
<properties>
22+
<maven.compiler.source>21</maven.compiler.source>
23+
<maven.compiler.target>21</maven.compiler.target>
24+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
</properties>
26+
27+
<dependencies>
28+
<dependency>
29+
<groupId>simplexity.simplepms</groupId>
30+
<artifactId>common</artifactId>
31+
<version>${project.parent.version}</version>
32+
</dependency>
33+
</dependencies>
34+
35+
</project>

‎paper/pom.xml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>simplexity.simplepms</groupId>
8+
<artifactId>paper</artifactId>
9+
<version>2.4.2</version>
10+
<packaging>jar</packaging>
11+
<name>SimplePMs</name>
12+
13+
<description>Plugin focused on simple private messaging.</description>
14+
<properties>
15+
<java.version>17</java.version>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
</properties>
18+
19+
<parent>
20+
<groupId>simplexity</groupId>
21+
<artifactId>SimplePMs</artifactId>
22+
<version>2.4.2</version>
23+
</parent>
24+
25+
<build>
26+
<finalName>${project.parent.artifactId}-${project.artifactId}-${project.version}</finalName>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.apache.maven.plugins</groupId>
30+
<artifactId>maven-compiler-plugin</artifactId>
31+
<version>3.8.1</version>
32+
<configuration>
33+
<source>21</source>
34+
<target>21</target>
35+
<compilerArgs>--enable-preview</compilerArgs>
36+
</configuration>
37+
</plugin>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-shade-plugin</artifactId>
41+
<version>3.2.4</version>
42+
<executions>
43+
<execution>
44+
<phase>package</phase>
45+
<goals>
46+
<goal>shade</goal>
47+
</goals>
48+
<configuration>
49+
<createDependencyReducedPom>false</createDependencyReducedPom>
50+
<transformers>
51+
<transformer
52+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
53+
<manifestEntries>
54+
<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
55+
</manifestEntries>
56+
</transformer>
57+
</transformers>
58+
<filters>
59+
<filter>
60+
<artifact>*:*</artifact>
61+
<excludes>
62+
<exclude>META-INF/MANIFEST.MF</exclude>
63+
</excludes>
64+
</filter>
65+
</filters>
66+
</configuration>
67+
</execution>
68+
</executions>
69+
</plugin>
70+
</plugins>
71+
<resources>
72+
<resource>
73+
<directory>src/main/resources</directory>
74+
<filtering>true</filtering>
75+
</resource>
76+
</resources>
77+
</build>
78+
79+
<repositories>
80+
<repository>
81+
<id>placeholderapi</id>
82+
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
83+
</repository>
84+
<repository>
85+
<id>papermc-repo</id>
86+
<url>https://repo.papermc.io/repository/maven-public/</url>
87+
</repository>
88+
<repository>
89+
<id>sonatype</id>
90+
<url>https://oss.sonatype.org/content/groups/public/</url>
91+
</repository>
92+
</repositories>
93+
94+
<dependencies>
95+
<dependency>
96+
<groupId>simplexity.simplepms</groupId>
97+
<artifactId>common</artifactId>
98+
<version>${project.parent.version}</version>
99+
</dependency>
100+
<dependency>
101+
<groupId>io.papermc.paper</groupId>
102+
<artifactId>paper-api</artifactId>
103+
<version>1.21.10-R0.1-SNAPSHOT</version>
104+
<scope>provided</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>me.clip</groupId>
108+
<artifactId>placeholderapi</artifactId>
109+
<version>2.11.6</version>
110+
<scope>provided</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.zaxxer</groupId>
114+
<artifactId>HikariCP</artifactId>
115+
<version>6.3.0</version>
116+
</dependency>
117+
</dependencies>
118+
</project>

src/main/java/simplexity/simplepms/SimplePMs.java renamed to paper/src/main/java/simplexity/simplepms/paper/SimplePMs.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
package simplexity.simplepms;
1+
package simplexity.simplepms.paper;
22

33
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
44
import net.kyori.adventure.text.minimessage.MiniMessage;
55
import org.bukkit.command.ConsoleCommandSender;
66
import org.bukkit.plugin.Plugin;
77
import org.bukkit.plugin.java.JavaPlugin;
8-
import simplexity.simplepms.commands.Block;
9-
import simplexity.simplepms.commands.Blocklist;
10-
import simplexity.simplepms.commands.MessageToggle;
11-
import simplexity.simplepms.commands.PrivateMessage;
12-
import simplexity.simplepms.commands.Reload;
13-
import simplexity.simplepms.commands.Reply;
14-
import simplexity.simplepms.commands.SocialSpy;
15-
import simplexity.simplepms.commands.Unblock;
16-
import simplexity.simplepms.config.ConfigHandler;
17-
import simplexity.simplepms.listeners.JoinListener;
18-
import simplexity.simplepms.listeners.PreCommandListener;
19-
import simplexity.simplepms.listeners.QuitListener;
20-
import simplexity.simplepms.logic.Constants;
21-
import simplexity.simplepms.saving.SqlHandler;
8+
import simplexity.simplepms.paper.commands.Block;
9+
import simplexity.simplepms.paper.commands.Blocklist;
10+
import simplexity.simplepms.paper.commands.MessageToggle;
11+
import simplexity.simplepms.paper.commands.PrivateMessage;
12+
import simplexity.simplepms.paper.commands.Reload;
13+
import simplexity.simplepms.paper.commands.Reply;
14+
import simplexity.simplepms.paper.commands.SocialSpy;
15+
import simplexity.simplepms.paper.commands.Unblock;
16+
import simplexity.simplepms.paper.config.ConfigHandler;
17+
import simplexity.simplepms.paper.listeners.JoinListener;
18+
import simplexity.simplepms.paper.listeners.PreCommandListener;
19+
import simplexity.simplepms.paper.listeners.QuitListener;
20+
import simplexity.simplepms.paper.logic.Constants;
21+
import simplexity.simplepms.paper.saving.SqlHandler;
2222

2323
@SuppressWarnings("UnstableApiUsage")
2424
public final class SimplePMs extends JavaPlugin {

src/main/java/simplexity/simplepms/commands/Block.java renamed to paper/src/main/java/simplexity/simplepms/paper/commands/Block.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package simplexity.simplepms.commands;
1+
package simplexity.simplepms.paper.commands;
22

33
import com.mojang.brigadier.Command;
44
import com.mojang.brigadier.arguments.StringArgumentType;
@@ -12,11 +12,11 @@
1212
import org.bukkit.command.CommandSender;
1313
import org.bukkit.entity.Player;
1414
import org.jetbrains.annotations.NotNull;
15-
import simplexity.simplepms.commands.arguments.OfflinePlayerArgument;
16-
import simplexity.simplepms.commands.util.Exceptions;
17-
import simplexity.simplepms.config.LocaleMessage;
18-
import simplexity.simplepms.logic.BlockHandler;
19-
import simplexity.simplepms.logic.Constants;
15+
import simplexity.simplepms.paper.commands.arguments.OfflinePlayerArgument;
16+
import simplexity.simplepms.paper.commands.util.Exceptions;
17+
import simplexity.simplepms.paper.config.LocaleMessage;
18+
import simplexity.simplepms.paper.logic.BlockHandler;
19+
import simplexity.simplepms.paper.logic.Constants;
2020

2121
@SuppressWarnings("UnstableApiUsage")
2222
public class Block {

src/main/java/simplexity/simplepms/commands/Blocklist.java renamed to paper/src/main/java/simplexity/simplepms/paper/commands/Blocklist.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package simplexity.simplepms.commands;
1+
package simplexity.simplepms.paper.commands;
22

33
import com.mojang.brigadier.Command;
44
import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -8,11 +8,11 @@
88
import net.kyori.adventure.text.minimessage.MiniMessage;
99
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
1010
import org.bukkit.entity.Player;
11-
import simplexity.simplepms.SimplePMs;
12-
import simplexity.simplepms.config.LocaleMessage;
13-
import simplexity.simplepms.logic.Constants;
14-
import simplexity.simplepms.saving.Cache;
15-
import simplexity.simplepms.saving.objects.PlayerBlock;
11+
import simplexity.simplepms.paper.SimplePMs;
12+
import simplexity.simplepms.paper.config.LocaleMessage;
13+
import simplexity.simplepms.paper.logic.Constants;
14+
import simplexity.simplepms.paper.saving.Cache;
15+
import simplexity.simplepms.paper.saving.objects.PlayerBlock;
1616

1717
import java.util.List;
1818
import java.util.UUID;

src/main/java/simplexity/simplepms/commands/MessageToggle.java renamed to paper/src/main/java/simplexity/simplepms/paper/commands/MessageToggle.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package simplexity.simplepms.commands;
1+
package simplexity.simplepms.paper.commands;
22

33
import com.mojang.brigadier.Command;
44
import com.mojang.brigadier.tree.LiteralCommandNode;
55
import io.papermc.paper.command.brigadier.CommandSourceStack;
66
import io.papermc.paper.command.brigadier.Commands;
77
import org.bukkit.entity.Player;
8-
import simplexity.simplepms.config.LocaleMessage;
9-
import simplexity.simplepms.logic.Constants;
10-
import simplexity.simplepms.saving.Cache;
11-
import simplexity.simplepms.saving.objects.PlayerSettings;
8+
import simplexity.simplepms.paper.config.LocaleMessage;
9+
import simplexity.simplepms.paper.logic.Constants;
10+
import simplexity.simplepms.paper.saving.Cache;
11+
import simplexity.simplepms.paper.saving.objects.PlayerSettings;
1212

1313
import java.util.UUID;
1414

src/main/java/simplexity/simplepms/commands/PrivateMessage.java renamed to paper/src/main/java/simplexity/simplepms/paper/commands/PrivateMessage.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package simplexity.simplepms.commands;
1+
package simplexity.simplepms.paper.commands;
22

33
import com.mojang.brigadier.Command;
44
import com.mojang.brigadier.arguments.StringArgumentType;
@@ -9,11 +9,11 @@
99
import io.papermc.paper.command.brigadier.CommandSourceStack;
1010
import io.papermc.paper.command.brigadier.Commands;
1111
import org.bukkit.command.CommandSender;
12-
import simplexity.simplepms.commands.arguments.Target;
13-
import simplexity.simplepms.commands.arguments.TargetArgument;
14-
import simplexity.simplepms.commands.util.MessageChecks;
15-
import simplexity.simplepms.logic.Constants;
16-
import simplexity.simplepms.logic.PMHandler;
12+
import simplexity.simplepms.paper.commands.arguments.Target;
13+
import simplexity.simplepms.paper.commands.arguments.TargetArgument;
14+
import simplexity.simplepms.paper.commands.util.MessageChecks;
15+
import simplexity.simplepms.paper.logic.Constants;
16+
import simplexity.simplepms.paper.logic.PMHandler;
1717

1818
@SuppressWarnings("UnstableApiUsage")
1919
public class PrivateMessage {

src/main/java/simplexity/simplepms/commands/Reload.java renamed to paper/src/main/java/simplexity/simplepms/paper/commands/Reload.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package simplexity.simplepms.commands;
1+
package simplexity.simplepms.paper.commands;
22

33
import com.mojang.brigadier.Command;
44
import com.mojang.brigadier.tree.LiteralCommandNode;
55
import io.papermc.paper.command.brigadier.CommandSourceStack;
66
import io.papermc.paper.command.brigadier.Commands;
77
import org.bukkit.command.CommandSender;
8-
import simplexity.simplepms.config.ConfigHandler;
9-
import simplexity.simplepms.config.LocaleMessage;
10-
import simplexity.simplepms.logic.Constants;
11-
import simplexity.simplepms.saving.SqlHandler;
8+
import simplexity.simplepms.paper.config.ConfigHandler;
9+
import simplexity.simplepms.paper.config.LocaleMessage;
10+
import simplexity.simplepms.paper.logic.Constants;
11+
import simplexity.simplepms.paper.saving.SqlHandler;
1212

1313
@SuppressWarnings("UnstableApiUsage")
1414
public class Reload {

0 commit comments

Comments
 (0)