Skip to content

Commit 5075325

Browse files
Louis292Louis292
committed
Update code
1 parent 4af45c6 commit 5075325

File tree

7 files changed

+165
-59
lines changed

7 files changed

+165
-59
lines changed

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/target/
22
/.idea
33
BabyModel-Bungee/target/
4-
BabyModel-Spigot/target/
4+
BabyModel-Spigot/target/
5+
6+
BabyModel-Spigot/.idea
7+
BabyModel-Bungee/.idea

‎BabyModel-Bungee/dependency-reduced-pom.xml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>BabyModel</artifactId>
5+
<groupId>fr.babystaff</groupId>
6+
<version>1.0.0</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>BabyModel-Bungee</artifactId>
10+
<name>BabyModel-Bungee</name>
11+
<build>
12+
<plugins>
13+
<plugin>
14+
<artifactId>maven-shade-plugin</artifactId>
15+
<version>3.2.1</version>
16+
<executions>
17+
<execution>
18+
<phase>package</phase>
19+
<goals>
20+
<goal>shade</goal>
21+
</goals>
22+
</execution>
23+
</executions>
24+
</plugin>
25+
</plugins>
26+
</build>
27+
<dependencies>
28+
<dependency>
29+
<groupId>net.md-5</groupId>
30+
<artifactId>bungeecord-api</artifactId>
31+
<version>1.21-R0.1-SNAPSHOT</version>
32+
<scope>provided</scope>
33+
<exclusions>
34+
<exclusion>
35+
<artifactId>bungeecord-chat</artifactId>
36+
<groupId>net.md-5</groupId>
37+
</exclusion>
38+
<exclusion>
39+
<artifactId>bungeecord-config</artifactId>
40+
<groupId>net.md-5</groupId>
41+
</exclusion>
42+
<exclusion>
43+
<artifactId>bungeecord-event</artifactId>
44+
<groupId>net.md-5</groupId>
45+
</exclusion>
46+
<exclusion>
47+
<artifactId>bungeecord-protocol</artifactId>
48+
<groupId>net.md-5</groupId>
49+
</exclusion>
50+
<exclusion>
51+
<artifactId>netty-transport-native-unix-common</artifactId>
52+
<groupId>io.netty</groupId>
53+
</exclusion>
54+
<exclusion>
55+
<artifactId>snakeyaml</artifactId>
56+
<groupId>org.yaml</groupId>
57+
</exclusion>
58+
<exclusion>
59+
<artifactId>guava</artifactId>
60+
<groupId>com.google.guava</groupId>
61+
</exclusion>
62+
</exclusions>
63+
</dependency>
64+
</dependencies>
65+
</project>

‎BabyModel-Bungee/pom.xml

+10-6
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@
5858
<plugins>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-compiler-plugin</artifactId>
62-
<version>3.8.1</version>
63-
<configuration>
64-
<source>${java.version}</source>
65-
<target>${java.version}</target>
66-
</configuration>
61+
<artifactId>maven-shade-plugin</artifactId>
62+
<version>3.2.1</version>
63+
<executions>
64+
<execution>
65+
<phase>package</phase>
66+
<goals>
67+
<goal>shade</goal>
68+
</goals>
69+
</execution>
70+
</executions>
6771
</plugin>
6872
</plugins>
6973
</build>

‎BabyModel-Bungee/src/main/resources/lang/FR_fr.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"welcome": "Bienvenue sur le serveur",
3-
"exit": "Vous avez quitter une partie"
3+
"exit": "Vous avez quitter une partie",
4+
5+
"BabyModelGame-Bungee.JoinMessageMotd": "Vous avez rejoint le serveur NAME, IP"
46
}

‎BabyModel-Spigot/BabyModel-Spigot.iml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module version="4">
3+
<component name="FacetManager">
4+
<facet type="minecraft" name="Minecraft">
5+
<configuration>
6+
<autoDetectTypes>
7+
<platformType>SPIGOT</platformType>
8+
</autoDetectTypes>
9+
<projectReimportVersion>1</projectReimportVersion>
10+
</configuration>
11+
</facet>
12+
</component>
13+
</module>

‎BabyModel-Spigot/dependency-reduced-pom.xml

+59-44
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>BabyModel</artifactId>
5+
<groupId>fr.babystaff</groupId>
6+
<version>1.0.0</version>
7+
</parent>
38
<modelVersion>4.0.0</modelVersion>
4-
<groupId>fr.babystaff</groupId>
5-
<artifactId>BabyModel</artifactId>
9+
<artifactId>BabyModel-Spigot</artifactId>
610
<name>BabyModel-Spigot</name>
7-
<version>1.0.0</version>
811
<build>
9-
<resources>
10-
<resource>
11-
<directory>src/main/resources</directory>
12-
</resource>
13-
</resources>
1412
<plugins>
15-
<plugin>
16-
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>3.8.1</version>
18-
<configuration>
19-
<source>${java.version}</source>
20-
<target>${java.version}</target>
21-
</configuration>
22-
</plugin>
2313
<plugin>
2414
<artifactId>maven-shade-plugin</artifactId>
25-
<version>3.2.4</version>
15+
<version>3.2.1</version>
2616
<executions>
2717
<execution>
2818
<phase>package</phase>
@@ -32,22 +22,6 @@
3222
</execution>
3323
</executions>
3424
</plugin>
35-
<plugin>
36-
<artifactId>maven-resources-plugin</artifactId>
37-
<version>3.3.1</version>
38-
<executions>
39-
<execution>
40-
<goals>
41-
<goal>resources</goal>
42-
</goals>
43-
<configuration>
44-
<nonFilteredFileExtensions>
45-
<nonFilteredFileExtension>jar</nonFilteredFileExtension>
46-
</nonFilteredFileExtensions>
47-
</configuration>
48-
</execution>
49-
</executions>
50-
</plugin>
5125
</plugins>
5226
</build>
5327
<repositories>
@@ -76,23 +50,64 @@
7650
<artifactId>spigot-api</artifactId>
7751
<version>1.8.8-R0.1-SNAPSHOT</version>
7852
<scope>provided</scope>
53+
<exclusions>
54+
<exclusion>
55+
<artifactId>commons-lang</artifactId>
56+
<groupId>commons-lang</groupId>
57+
</exclusion>
58+
<exclusion>
59+
<artifactId>json-simple</artifactId>
60+
<groupId>com.googlecode.json-simple</groupId>
61+
</exclusion>
62+
<exclusion>
63+
<artifactId>guava</artifactId>
64+
<groupId>com.google.guava</groupId>
65+
</exclusion>
66+
<exclusion>
67+
<artifactId>ebean</artifactId>
68+
<groupId>org.avaje</groupId>
69+
</exclusion>
70+
<exclusion>
71+
<artifactId>snakeyaml</artifactId>
72+
<groupId>org.yaml</groupId>
73+
</exclusion>
74+
<exclusion>
75+
<artifactId>bungeecord-chat</artifactId>
76+
<groupId>net.md-5</groupId>
77+
</exclusion>
78+
</exclusions>
7979
</dependency>
8080
<dependency>
8181
<groupId>com.mojang</groupId>
8282
<artifactId>authlib</artifactId>
8383
<version>1.5.22</version>
8484
<scope>provided</scope>
85+
<exclusions>
86+
<exclusion>
87+
<artifactId>commons-lang3</artifactId>
88+
<groupId>org.apache.commons</groupId>
89+
</exclusion>
90+
<exclusion>
91+
<artifactId>log4j-core</artifactId>
92+
<groupId>org.apache.logging.log4j</groupId>
93+
</exclusion>
94+
<exclusion>
95+
<artifactId>commons-codec</artifactId>
96+
<groupId>commons-codec</groupId>
97+
</exclusion>
98+
<exclusion>
99+
<artifactId>log4j-api</artifactId>
100+
<groupId>org.apache.logging.log4j</groupId>
101+
</exclusion>
102+
<exclusion>
103+
<artifactId>commons-io</artifactId>
104+
<groupId>commons-io</groupId>
105+
</exclusion>
106+
<exclusion>
107+
<artifactId>guava</artifactId>
108+
<groupId>com.google.guava</groupId>
109+
</exclusion>
110+
</exclusions>
85111
</dependency>
86112
</dependencies>
87-
<distributionManagement>
88-
<repository>
89-
<id>github</id>
90-
<name>BabyModel</name>
91-
<url>https://maven.pkg.github.com/Baby-Game/BabyModel</url>
92-
</repository>
93-
</distributionManagement>
94-
<properties>
95-
<java.version>1.8</java.version>
96-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
97-
</properties>
98113
</project>

‎BabyModel-Spigot/pom.xml

+11-7
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@
8484
<plugins>
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-compiler-plugin</artifactId>
88-
<version>3.8.1</version>
89-
<configuration>
90-
<source>${java.version}</source>
91-
<target>${java.version}</target>
92-
</configuration>
87+
<artifactId>maven-shade-plugin</artifactId>
88+
<version>3.2.1</version>
89+
<executions>
90+
<execution>
91+
<phase>package</phase>
92+
<goals>
93+
<goal>shade</goal>
94+
</goals>
95+
</execution>
96+
</executions>
9397
</plugin>
9498
</plugins>
9599
</build>
96-
</project>
100+
</project>

0 commit comments

Comments
 (0)