Skip to content

Commit b7e0ad4

Browse files
DreamVoidDreamVoid
committed
多项更改
适应Paper的libraries目录 为Sponge和Velocity适应maven版本号
1 parent 0b048a7 commit b7e0ad4

File tree

8 files changed

+148
-9
lines changed

8 files changed

+148
-9
lines changed

‎MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/loader/LibraryLoader.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.dreamvoid.miraimc.internal.loader;
22

33
import com.google.common.base.Suppliers;
4-
import me.dreamvoid.miraimc.MiraiMCConfig;
54
import me.dreamvoid.miraimc.internal.Utils;
65
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
76
import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -57,7 +56,7 @@ public LibraryLoader(URLClassLoader urlClassLoader) {
5756

5857
this.session.setSystemProperties(System.getProperties());
5958
this.session.setChecksumPolicy(RepositoryPolicy.CHECKSUM_POLICY_FAIL);
60-
this.session.setLocalRepositoryManager(this.repository.newLocalRepositoryManager(this.session, new LocalRepository(new File(MiraiMCConfig.PluginDir, "libraries"))));
59+
this.session.setLocalRepositoryManager(this.repository.newLocalRepositoryManager(this.session, new LocalRepository("libraries")));
6160
this.session.setTransferListener(new AbstractTransferListener() {
6261
@Override
6362
public void transferInitiated(@NotNull TransferEvent event) throws TransferCancelledException {

‎MiraiMC-Bukkit/pom.xml

+29-1
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,41 @@
6868
<pattern>org.apache</pattern>
6969
<shadedPattern>me.dreamvoid.miraimc.libraries.org.apache</shadedPattern>
7070
</relocation>
71+
<relocation>
72+
<pattern>org.eclipse</pattern>
73+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
74+
<excludes>
75+
<exclude>org.eclipse.aether.**</exclude>
76+
</excludes>
77+
</relocation>
78+
<relocation>
79+
<pattern>org.aopalliance</pattern>
80+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.aopalliance</shadedPattern>
81+
</relocation>
82+
<relocation>
83+
<pattern>org.checkerframework</pattern>
84+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.checkerframework</shadedPattern>
85+
</relocation>
86+
<relocation>
87+
<pattern>org.codehaus</pattern>
88+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.codehaus</shadedPattern>
89+
</relocation>
90+
<relocation>
91+
<pattern>org.objectweb</pattern>
92+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.objectweb</shadedPattern>
93+
</relocation>
7194
</relocations>
7295
<filters>
7396
<filter>
7497
<artifact>*:*</artifact>
7598
<excludes>
76-
<exclude>META-INF/*</exclude>
99+
<exclude>META-INF/**</exclude>
77100
<exclude>mozilla/public-suffix-list.txt</exclude>
101+
<exclude>**/*.TXT</exclude>
102+
<exclude>**/*.html</exclude>
103+
<exclude>beans.xsd</exclude>
104+
<exclude>plugin.xml</exclude>
105+
<exclude>javax/**</exclude>
78106
</excludes>
79107
</filter>
80108
</filters>

‎MiraiMC-Bungee/pom.xml

+26-1
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,38 @@
6565
<pattern>org.apache</pattern>
6666
<shadedPattern>me.dreamvoid.miraimc.libraries.org.apache</shadedPattern>
6767
</relocation>
68+
<relocation>
69+
<pattern>org.eclipse</pattern>
70+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
71+
</relocation>
72+
<relocation>
73+
<pattern>org.aopalliance</pattern>
74+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.aopalliance</shadedPattern>
75+
</relocation>
76+
<relocation>
77+
<pattern>org.checkerframework</pattern>
78+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.checkerframework</shadedPattern>
79+
</relocation>
80+
<relocation>
81+
<pattern>org.codehaus</pattern>
82+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.codehaus</shadedPattern>
83+
</relocation>
84+
<relocation>
85+
<pattern>org.objectweb</pattern>
86+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.objectweb</shadedPattern>
87+
</relocation>
6888
</relocations>
6989
<filters>
7090
<filter>
7191
<artifact>*:*</artifact>
7292
<excludes>
73-
<exclude>META-INF/*</exclude>
93+
<exclude>META-INF/**</exclude>
7494
<exclude>mozilla/public-suffix-list.txt</exclude>
95+
<exclude>**/*.TXT</exclude>
96+
<exclude>**/*.html</exclude>
97+
<exclude>beans.xsd</exclude>
98+
<exclude>plugin.xml</exclude>
99+
<exclude>javax/**</exclude>
75100
</excludes>
76101
</filter>
77102
</filters>

‎MiraiMC-Nukkit/pom.xml

+26-1
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,38 @@
6060
<pattern>org.apache</pattern>
6161
<shadedPattern>me.dreamvoid.miraimc.libraries.org.apache</shadedPattern>
6262
</relocation>
63+
<relocation>
64+
<pattern>org.eclipse</pattern>
65+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
66+
</relocation>
67+
<relocation>
68+
<pattern>org.aopalliance</pattern>
69+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.aopalliance</shadedPattern>
70+
</relocation>
71+
<relocation>
72+
<pattern>org.checkerframework</pattern>
73+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.checkerframework</shadedPattern>
74+
</relocation>
75+
<relocation>
76+
<pattern>org.codehaus</pattern>
77+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.codehaus</shadedPattern>
78+
</relocation>
79+
<relocation>
80+
<pattern>org.objectweb</pattern>
81+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.objectweb</shadedPattern>
82+
</relocation>
6383
</relocations>
6484
<filters>
6585
<filter>
6686
<artifact>*:*</artifact>
6787
<excludes>
68-
<exclude>META-INF/*</exclude>
88+
<exclude>META-INF/**</exclude>
6989
<exclude>mozilla/public-suffix-list.txt</exclude>
90+
<exclude>**/*.TXT</exclude>
91+
<exclude>**/*.html</exclude>
92+
<exclude>beans.xsd</exclude>
93+
<exclude>plugin.xml</exclude>
94+
<exclude>javax/**</exclude>
7095
</excludes>
7196
</filter>
7297
</filters>

‎MiraiMC-Sponge/pom.xml

+34-1
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,50 @@
5656
<configuration>
5757
<minimizeJar>true</minimizeJar>
5858
<relocations>
59+
<relocation>
60+
<pattern>MIRAIMC.VERSION</pattern>
61+
<shadedPattern>${project.version}</shadedPattern>
62+
</relocation>
5963
<relocation>
6064
<pattern>org.apache</pattern>
6165
<shadedPattern>me.dreamvoid.miraimc.libraries.org.apache</shadedPattern>
6266
</relocation>
67+
<relocation>
68+
<pattern>org.eclipse</pattern>
69+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
70+
</relocation>
71+
<relocation>
72+
<pattern>org.eclipse</pattern>
73+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
74+
</relocation>
75+
<relocation>
76+
<pattern>org.aopalliance</pattern>
77+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.aopalliance</shadedPattern>
78+
</relocation>
79+
<relocation>
80+
<pattern>org.checkerframework</pattern>
81+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.checkerframework</shadedPattern>
82+
</relocation>
83+
<relocation>
84+
<pattern>org.codehaus</pattern>
85+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.codehaus</shadedPattern>
86+
</relocation>
87+
<relocation>
88+
<pattern>org.objectweb</pattern>
89+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.objectweb</shadedPattern>
90+
</relocation>
6391
</relocations>
6492
<filters>
6593
<filter>
6694
<artifact>*:*</artifact>
6795
<excludes>
68-
<exclude>META-INF/*</exclude>
96+
<exclude>META-INF/**</exclude>
6997
<exclude>mozilla/public-suffix-list.txt</exclude>
98+
<exclude>**/*.TXT</exclude>
99+
<exclude>**/*.html</exclude>
100+
<exclude>beans.xsd</exclude>
101+
<exclude>plugin.xml</exclude>
102+
<exclude>javax/**</exclude>
70103
</excludes>
71104
</filter>
72105
</filters>

‎MiraiMC-Sponge/src/main/java/me/dreamvoid/miraimc/sponge/SpongePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@Plugin(id = "miraimc",
4040
name = "MiraiMC",
4141
description = "MiraiBot for Minecraft server",
42-
version = "1.8.3",
42+
version = "MIRAIMC.VERSION",
4343
url = "https://github.com/DreamVoid/MiraiMC",
4444
authors = {"DreamVoid"}
4545
)

‎MiraiMC-Velocity/pom.xml

+30-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<configuration>
2222
<minimizeJar>false</minimizeJar>
2323
<relocations>
24+
<relocation>
25+
<pattern>MIRAIMC.VERSION</pattern>
26+
<shadedPattern>${project.version}</shadedPattern>
27+
</relocation>
2428
<relocation>
2529
<pattern>com.zaxxer</pattern>
2630
<shadedPattern>me.dreamvoid.miraimc.libraries.com.zaxxer</shadedPattern>
@@ -29,13 +33,38 @@
2933
<pattern>org.apache</pattern>
3034
<shadedPattern>me.dreamvoid.miraimc.libraries.org.apache</shadedPattern>
3135
</relocation>
36+
<relocation>
37+
<pattern>org.eclipse</pattern>
38+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.eclipse</shadedPattern>
39+
</relocation>
40+
<relocation>
41+
<pattern>org.aopalliance</pattern>
42+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.aopalliance</shadedPattern>
43+
</relocation>
44+
<relocation>
45+
<pattern>org.checkerframework</pattern>
46+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.checkerframework</shadedPattern>
47+
</relocation>
48+
<relocation>
49+
<pattern>org.codehaus</pattern>
50+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.codehaus</shadedPattern>
51+
</relocation>
52+
<relocation>
53+
<pattern>org.objectweb</pattern>
54+
<shadedPattern>me.dreamvoid.miraimc.libraries.org.objectweb</shadedPattern>
55+
</relocation>
3256
</relocations>
3357
<filters>
3458
<filter>
3559
<artifact>*:*</artifact>
3660
<excludes>
37-
<exclude>META-INF/*</exclude>
61+
<exclude>META-INF/**</exclude>
3862
<exclude>mozilla/public-suffix-list.txt</exclude>
63+
<exclude>**/*.TXT</exclude>
64+
<exclude>**/*.html</exclude>
65+
<exclude>beans.xsd</exclude>
66+
<exclude>plugin.xml</exclude>
67+
<exclude>javax/**</exclude>
3968
</excludes>
4069
</filter>
4170
</filters>

‎MiraiMC-Velocity/src/main/java/me/dreamvoid/miraimc/velocity/VelocityPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@Plugin(
3535
id = "miraimc",
3636
name = "MiraiMC",
37-
version = "1.8.3",
37+
version = "MIRAIMC.VERSION",
3838
description = "MiraiBot for Minecraft server",
3939
url = "https://github.com/DreamVoid/MiraiMC",
4040
authors = {"DreamVoid"}

0 commit comments

Comments
 (0)