Skip to content

Commit 77ce8e5

Browse files
OllieMartinOllieMartin
authored
Merge pull request #85 from MultiChat/localrefactor
Complete Refactor of MultiChatSpigot and MultiChatSponge to MultiChatLocal
2 parents b50fa36 + 55cda38 commit 77ce8e5

File tree

217 files changed

+8055
-7203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+8055
-7203
lines changed

‎multichat/dependency-reduced-pom.xml‎

Lines changed: 64 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>xyz.olivermartin.multichat</groupId>
55
<artifactId>multichat</artifactId>
6-
<version>1.7.4</version>
6+
<version>1.9-snapshot.20.5.1</version>
77
<build>
88
<plugins>
99
<plugin>
@@ -20,8 +20,8 @@
2020
<configuration>
2121
<relocations>
2222
<relocation>
23-
<pattern>org.bstats</pattern>
24-
<shadedPattern>xyz.olivermartin.bungee</shadedPattern>
23+
<pattern>com.zaxxer.hikari</pattern>
24+
<shadedPattern>xyz.olivermartin.shadedlib.hikari</shadedPattern>
2525
</relocation>
2626
</relocations>
2727
</configuration>
@@ -67,12 +67,22 @@
6767
</repository>
6868
</repositories>
6969
<dependencies>
70+
<dependency>
71+
<groupId>org.xerial</groupId>
72+
<artifactId>sqlite-jdbc</artifactId>
73+
<version>3.27.2.1</version>
74+
<scope>provided</scope>
75+
</dependency>
7076
<dependency>
7177
<groupId>org.spongepowered</groupId>
7278
<artifactId>spongeapi</artifactId>
7379
<version>7.1.0</version>
7480
<scope>provided</scope>
7581
<exclusions>
82+
<exclusion>
83+
<artifactId>guava</artifactId>
84+
<groupId>com.google.guava</groupId>
85+
</exclusion>
7686
<exclusion>
7787
<artifactId>error_prone_annotations</artifactId>
7888
<groupId>com.google.errorprone</groupId>
@@ -134,7 +144,7 @@
134144
<dependency>
135145
<groupId>net.md-5</groupId>
136146
<artifactId>bungeecord-api</artifactId>
137-
<version>1.14-SNAPSHOT</version>
147+
<version>1.15-SNAPSHOT</version>
138148
<scope>provided</scope>
139149
<exclusions>
140150
<exclusion>
@@ -153,12 +163,24 @@
153163
<artifactId>bungeecord-protocol</artifactId>
154164
<groupId>net.md-5</groupId>
155165
</exclusion>
166+
<exclusion>
167+
<artifactId>netty-transport-native-unix-common</artifactId>
168+
<groupId>io.netty</groupId>
169+
</exclusion>
170+
<exclusion>
171+
<artifactId>snakeyaml</artifactId>
172+
<groupId>org.yaml</groupId>
173+
</exclusion>
174+
<exclusion>
175+
<artifactId>guava</artifactId>
176+
<groupId>com.google.guava</groupId>
177+
</exclusion>
156178
</exclusions>
157179
</dependency>
158180
<dependency>
159181
<groupId>net.md-5</groupId>
160182
<artifactId>bungeecord-api</artifactId>
161-
<version>1.14-SNAPSHOT</version>
183+
<version>1.15-SNAPSHOT</version>
162184
<type>javadoc</type>
163185
<scope>provided</scope>
164186
<exclusions>
@@ -178,22 +200,30 @@
178200
<artifactId>bungeecord-protocol</artifactId>
179201
<groupId>net.md-5</groupId>
180202
</exclusion>
203+
<exclusion>
204+
<artifactId>netty-transport-native-unix-common</artifactId>
205+
<groupId>io.netty</groupId>
206+
</exclusion>
207+
<exclusion>
208+
<artifactId>snakeyaml</artifactId>
209+
<groupId>org.yaml</groupId>
210+
</exclusion>
211+
<exclusion>
212+
<artifactId>guava</artifactId>
213+
<groupId>com.google.guava</groupId>
214+
</exclusion>
181215
</exclusions>
182216
</dependency>
183217
<dependency>
184218
<groupId>org.spigotmc</groupId>
185219
<artifactId>spigot-api</artifactId>
186-
<version>1.14.2-R0.1-SNAPSHOT</version>
220+
<version>1.15.1-R0.1-SNAPSHOT</version>
187221
<scope>provided</scope>
188222
<exclusions>
189223
<exclusion>
190224
<artifactId>commons-lang</artifactId>
191225
<groupId>commons-lang</groupId>
192226
</exclusion>
193-
<exclusion>
194-
<artifactId>snakeyaml</artifactId>
195-
<groupId>org.yaml</groupId>
196-
</exclusion>
197227
<exclusion>
198228
<artifactId>gson</artifactId>
199229
<groupId>com.google.code.gson</groupId>
@@ -202,6 +232,14 @@
202232
<artifactId>bungeecord-chat</artifactId>
203233
<groupId>net.md-5</groupId>
204234
</exclusion>
235+
<exclusion>
236+
<artifactId>snakeyaml</artifactId>
237+
<groupId>org.yaml</groupId>
238+
</exclusion>
239+
<exclusion>
240+
<artifactId>guava</artifactId>
241+
<groupId>com.google.guava</groupId>
242+
</exclusion>
205243
</exclusions>
206244
</dependency>
207245
<dependency>
@@ -222,6 +260,22 @@
222260
<version>2.9.2</version>
223261
<scope>provided</scope>
224262
</dependency>
263+
<dependency>
264+
<groupId>com.github.rojo8399</groupId>
265+
<artifactId>PlaceholderAPI</artifactId>
266+
<version>master-SNAPSHOT</version>
267+
<scope>provided</scope>
268+
<exclusions>
269+
<exclusion>
270+
<artifactId>reflections</artifactId>
271+
<groupId>org.reflections</groupId>
272+
</exclusion>
273+
<exclusion>
274+
<artifactId>configurate-hocon</artifactId>
275+
<groupId>ninja.leaping.configurate</groupId>
276+
</exclusion>
277+
</exclusions>
278+
</dependency>
225279
</dependencies>
226280
</project>
227281

‎multichat/pom.xml‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>xyz.olivermartin.multichat</groupId>
77
<artifactId>multichat</artifactId>
8-
<version>1.8.1</version>
8+
<version>1.9-snapshot.20.5.1</version>
99

1010
<repositories>
1111

@@ -48,11 +48,27 @@
4848

4949
<build>
5050
<plugins>
51-
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId>
52-
<version>3.1.0</version> <configuration> <relocations> <relocation> <pattern>org.bstats</pattern>
53-
<shadedPattern>xyz.olivermartin.bungee</shadedPattern> </relocation> </relocations>
54-
</configuration> <executions> <execution> <phase>package</phase> <goals>
55-
<goal>shade</goal> </goals> </execution> </executions> </plugin> -->
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-shade-plugin</artifactId>
54+
<version>3.1.0</version>
55+
<configuration>
56+
<relocations>
57+
<relocation>
58+
<pattern>com.zaxxer.hikari</pattern>
59+
<shadedPattern>xyz.olivermartin.shadedlib.hikari</shadedPattern>
60+
</relocation>
61+
</relocations>
62+
</configuration>
63+
<executions>
64+
<execution>
65+
<phase>package</phase>
66+
<goals>
67+
<goal>shade</goal>
68+
</goals>
69+
</execution>
70+
</executions>
71+
</plugin>
5672

5773
<plugin>
5874
<groupId>org.apache.maven.plugins</groupId>
@@ -68,17 +84,17 @@
6884

6985
<dependencies>
7086

71-
<!-- <dependency>
72-
<groupId>org.bstats</groupId>
73-
<artifactId>bstats-bungeecord</artifactId>
74-
<version>1.4</version>
75-
<scope>compile</scope>
76-
</dependency> -->
87+
<dependency>
88+
<groupId>com.zaxxer</groupId>
89+
<artifactId>HikariCP</artifactId>
90+
<version>2.6.1</version>
91+
</dependency>
7792

7893
<dependency>
7994
<groupId>org.xerial</groupId>
8095
<artifactId>sqlite-jdbc</artifactId>
8196
<version>3.27.2.1</version>
97+
<scope>provided</scope>
8298
</dependency>
8399

84100
<dependency>
@@ -129,6 +145,7 @@
129145
<groupId>com.github.rojo8399</groupId>
130146
<artifactId>PlaceholderAPI</artifactId>
131147
<version>master-SNAPSHOT</version>
148+
<scope>provided</scope>
132149
</dependency>
133150

134151
</dependencies>

‎multichat/releases/1.8.2/multichat-1.8.2-pre.1.jar‎

355 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-pre.2.jar‎

533 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-pre.3.jar‎

533 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-pre.4.jar‎

533 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-pre.5.jar‎

533 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-snapshot.20.4.17.1.jar‎

354 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-snapshot.20.4.25.2.jar‎

355 KB
Binary file not shown.

‎multichat/releases/1.8.2/multichat-1.8.2-snapshot.20.4.26.1.jar‎

357 KB
Binary file not shown.

0 commit comments

Comments
 (0)