Skip to content

Commit 4deaeaf

Browse files
TechnicJelleTechnicJelle
committed
Update dependencies & bump version to 3.0
1 parent 2f809db commit 4deaeaf

File tree

4 files changed

+46
-37
lines changed

4 files changed

+46
-37
lines changed

‎pom.xml

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,55 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.technicjelle</groupId>
8-
<artifactId>BlueMapOfflinePlayerMarkers</artifactId>
9-
<version>3.0-SNAPSHOT</version>
8+
<artifactId>bluemapofflineplayermarkers</artifactId>
9+
<version>3.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>BlueMapOfflinePlayerMarkers</name>
13-
1413
<description>Adds markers where players have logged off to BlueMap</description>
14+
<url>https://github.com/TechnicJelle/BlueMapOfflinePlayerMarkers/</url>
15+
1516
<properties>
16-
<java.version>11</java.version>
17+
<java.version>16</java.version>
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
</properties>
19-
<url>https://github.com/TechnicJelle/BlueMapOfflinePlayerMarkers/</url>
2020

2121
<build>
22+
<finalName>${project.name}-${project.version}</finalName>
2223
<plugins>
2324
<plugin>
2425
<groupId>org.apache.maven.plugins</groupId>
2526
<artifactId>maven-compiler-plugin</artifactId>
26-
<version>3.8.1</version>
27+
<version>3.13.0</version>
2728
<configuration>
28-
<source>${java.version}</source>
29-
<target>${java.version}</target>
29+
<release>${java.version}</release>
3030
</configuration>
3131
</plugin>
3232
<plugin>
3333
<groupId>org.apache.maven.plugins</groupId>
3434
<artifactId>maven-shade-plugin</artifactId>
35-
<version>3.4.1</version>
35+
<version>3.6.0</version>
3636
<configuration>
3737
<relocations>
3838
<relocation>
39-
<pattern>com.google</pattern>
40-
<shadedPattern>com.technicjelle.bluemapofflineplayermarkers.shadow</shadedPattern>
39+
<pattern>com.technicjelle.BMUtils</pattern>
40+
<shadedPattern>${project.groupId}.${project.artifactId}.shadow.BMUtils</shadedPattern>
41+
</relocation>
42+
<relocation>
43+
<pattern>com.technicjelle.MCUtils</pattern>
44+
<shadedPattern>${project.groupId}.${project.artifactId}.shadow.MCUtils</shadedPattern>
45+
</relocation>
46+
<relocation>
47+
<pattern>com.technicjelle.UpdateChecker</pattern>
48+
<shadedPattern>${project.groupId}.${project.artifactId}.shadow.UpdateChecker</shadedPattern>
4149
</relocation>
4250
<relocation>
4351
<pattern>org.bstats</pattern>
44-
<shadedPattern>com.technicjelle.bluemapofflineplayermarkers.shadow.bstats</shadedPattern>
52+
<shadedPattern>${project.groupId}.${project.artifactId}.shadow.bstats</shadedPattern>
53+
</relocation>
54+
<relocation>
55+
<pattern>org.spongepowered.configurate</pattern>
56+
<shadedPattern>${project.groupId}.${project.artifactId}.shadow.configurate</shadedPattern>
4557
</relocation>
4658
</relocations>
4759
</configuration>
@@ -72,50 +84,47 @@
7284
<url>https://papermc.io/repo/repository/maven-public/</url>
7385
</repository>
7486
<repository>
75-
<id>sonatype</id>
76-
<url>https://oss.sonatype.org/content/groups/public/</url>
77-
</repository>
78-
<repository>
79-
<id>jitpack.io</id>
80-
<url>https://jitpack.io</url>
87+
<id>bluecolored-releases</id>
88+
<name>BlueColored Repository</name>
89+
<url>https://repo.bluecolored.de/releases</url>
8190
</repository>
8291
</repositories>
8392

8493
<dependencies>
8594
<dependency>
86-
<groupId>com.github.TechnicJelle</groupId>
87-
<artifactId>UpdateCheckerJava</artifactId>
88-
<version>v2.3</version>
95+
<groupId>com.technicjelle</groupId>
96+
<artifactId>UpdateChecker</artifactId>
97+
<version>2.5.1</version>
8998
<scope>compile</scope>
9099
</dependency>
91100
<dependency>
92-
<groupId>com.github.TechnicJelle</groupId>
101+
<groupId>com.technicjelle</groupId>
93102
<artifactId>BMUtils</artifactId>
94-
<version>v1.1</version>
103+
<version>4.2.1</version>
95104
<scope>compile</scope>
96105
</dependency>
97106
<dependency>
98-
<groupId>com.github.TechnicJelle</groupId>
107+
<groupId>com.technicjelle</groupId>
99108
<artifactId>MCUtils</artifactId>
100-
<version>1.0</version>
109+
<version>2.0</version>
101110
<scope>compile</scope>
102111
</dependency>
103112
<dependency>
104113
<groupId>com.destroystokyo.paper</groupId>
105114
<artifactId>paper-api</artifactId>
106-
<version>1.13-R0.1-SNAPSHOT</version>
115+
<version>1.13.2-R0.1-SNAPSHOT</version>
107116
<scope>provided</scope>
108117
</dependency>
109118
<dependency>
110-
<groupId>com.github.BlueMap-Minecraft</groupId>
119+
<groupId>de.bluecolored.bluemap</groupId>
111120
<artifactId>BlueMapAPI</artifactId>
112-
<version>v2.6.1</version>
121+
<version>2.7.2</version>
113122
<scope>provided</scope>
114123
</dependency>
115124
<dependency>
116-
<groupId>com.github.BlueMap-Minecraft</groupId>
125+
<groupId>de.bluecolored.bluenbt</groupId>
117126
<artifactId>BlueNBT</artifactId>
118-
<version>v1.2.1</version>
127+
<version>2.3.0</version>
119128
</dependency>
120129
<dependency>
121130
<groupId>org.jetbrains</groupId>

‎src/main/java/com/technicjelle/bluemapofflineplayermarkers/core/markerhandler/BlueMapMarkerHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.technicjelle.bluemapofflineplayermarkers.core.markerhandler;
22

33
import com.flowpowered.math.vector.Vector3d;
4-
import com.technicjelle.BMUtils;
4+
import com.technicjelle.BMUtils.BMSkin;
55
import com.technicjelle.bluemapofflineplayermarkers.common.Config;
66
import com.technicjelle.bluemapofflineplayermarkers.common.Server;
77
import com.technicjelle.bluemapofflineplayermarkers.core.Player;
@@ -52,7 +52,7 @@ public void add(Player player, BlueMapAPI api) {
5252
// We need to create a separate marker per map, because the map-storage that the icon is saved in
5353
// is different for each map
5454
for (BlueMapMap map : blueMapWorld.getMaps()) {
55-
markerBuilder.icon(BMUtils.getPlayerHeadIconAddress(api, player.getPlayerUUID(), map), 0, 0); // centered with CSS instead
55+
markerBuilder.icon(BMSkin.getPlayerHeadIconAddress(api, player.getPlayerUUID(), map), 0, 0); // centered with CSS instead
5656

5757
// get marker-set (or create new marker set if none found)
5858
MarkerSet markerSet = map.getMarkerSets().computeIfAbsent(Config.MARKER_SET_ID, id -> MarkerSet.builder()

‎src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/BlueMapOfflinePlayerMarkers.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.technicjelle.bluemapofflineplayermarkers.impl.paper;
22

3-
import com.technicjelle.BMUtils;
3+
import com.technicjelle.BMUtils.BMCopy;
44
import com.technicjelle.UpdateChecker;
55
import com.technicjelle.bluemapofflineplayermarkers.core.BMApiStatus;
66
import com.technicjelle.bluemapofflineplayermarkers.core.Player;
@@ -32,8 +32,8 @@ public void onLoad() {
3232
BlueMapAPI.onEnable(api -> {
3333
getLogger().info("BlueMap is enabled! Copying resources to BlueMap webapp and registering them...");
3434
try {
35-
BMUtils.copyJarResourceToBlueMap(api, getClassLoader(), "style.css", "bmopm.css", false);
36-
BMUtils.copyJarResourceToBlueMap(api, getClassLoader(), "script.js", "bmopm.js", false);
35+
BMCopy.jarResourceToWebApp(api, getClassLoader(), "style.css", "bmopm.css", false);
36+
BMCopy.jarResourceToWebApp(api, getClassLoader(), "script.js", "bmopm.js", false);
3737
} catch (IOException e) {
3838
Singletons.getLogger().log(Level.SEVERE, "Failed to copy resources to BlueMap webapp!", e);
3939
}

‎src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PaperConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.technicjelle.bluemapofflineplayermarkers.impl.paper;
22

3-
import com.technicjelle.MCUtils;
3+
import com.technicjelle.MCUtils.ConfigUtils;
44
import com.technicjelle.bluemapofflineplayermarkers.common.Config;
55
import com.technicjelle.bluemapofflineplayermarkers.core.GameMode;
66
import org.bukkit.plugin.java.JavaPlugin;
@@ -23,7 +23,7 @@ public PaperConfig(JavaPlugin plugin) {
2323

2424
public void loadFromPlugin(JavaPlugin plugin) {
2525
try {
26-
MCUtils.copyPluginResourceToConfigDir(plugin, "config.yml", "config.yml", false);
26+
ConfigUtils.copyPluginResourceToConfigDir(plugin, "config.yml", "config.yml", false);
2727
} catch (IOException e) {
2828
throw new RuntimeException(e);
2929
}

0 commit comments

Comments
 (0)