Skip to content

Commit 6261dd7

Browse files
committed
feat: updated to 1.14.4
1 parent 7d43c4d commit 6261dd7

File tree

2 files changed

+71
-71
lines changed

2 files changed

+71
-71
lines changed

pom.xml

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
<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/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.dynmap</groupId>
4-
<artifactId>Dynmap-WorldGuard</artifactId>
5-
6-
<build>
7-
<resources>
8-
<resource>
9-
<directory>src/main/resources</directory>
10-
<filtering>true</filtering>
11-
<includes>
12-
<include>*.yml</include>
13-
<include>*.txt</include>
14-
</includes>
15-
</resource>
16-
<resource>
17-
<directory>src/main/resources</directory>
18-
<filtering>false</filtering>
19-
<excludes>
20-
<exclude>*.yml</exclude>
21-
<exclude>*.txt</exclude>
22-
</excludes>
23-
</resource>
24-
</resources>
25-
26-
<plugins>
27-
<plugin>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.dynmap</groupId>
6+
<artifactId>Dynmap-WorldGuard</artifactId>
7+
8+
<build>
9+
<resources>
10+
<resource>
11+
<directory>src/main/resources</directory>
12+
<filtering>true</filtering>
13+
<includes>
14+
<include>*.yml</include>
15+
<include>*.txt</include>
16+
</includes>
17+
</resource>
18+
<resource>
19+
<directory>src/main/resources</directory>
20+
<filtering>false</filtering>
21+
<excludes>
22+
<exclude>*.yml</exclude>
23+
<exclude>*.txt</exclude>
24+
</excludes>
25+
</resource>
26+
</resources>
27+
28+
<plugins>
29+
<plugin>
2830
<groupId>org.apache.maven.plugins</groupId>
2931
<artifactId>maven-compiler-plugin</artifactId>
3032
<version>2.0.2</version>
@@ -59,54 +61,52 @@
5961
</execution>
6062
</executions>
6163
</plugin>
62-
</plugins>
63-
</build>
64-
65-
<repositories>
64+
</plugins>
65+
</build>
66+
67+
<repositories>
6668
<repository>
67-
<releases>
68-
</releases>
69-
<snapshots>
70-
</snapshots>
7169
<id>dynmap-repo</id>
72-
<url>http://repo.mikeprimm.com/</url>
70+
<url>https://repo.mikeprimm.com/</url>
7371
</repository>
7472
<repository>
75-
<releases>
76-
</releases>
77-
<snapshots>
78-
</snapshots>
7973
<id>sk89q-repo</id>
80-
<url>http://maven.sk89q.com/repo/</url>
74+
<url>https://maven.sk89q.com/repo/</url>
75+
</repository>
76+
<repository>
77+
<id>spigot-repo</id>
78+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
8179
</repository>
8280
</repositories>
83-
84-
<dependencies>
85-
<dependency>
86-
<groupId>us.dynmap</groupId>
87-
<artifactId>dynmap-api</artifactId>
88-
<version>3.0-SNAPSHOT</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.bukkit</groupId>
92-
<artifactId>bukkit</artifactId>
93-
<version>1.7.10-R0.1-SNAPSHOT</version>
94-
</dependency>
95-
<dependency>
96-
<groupId>com.sk89q.worldguard</groupId>
97-
<artifactId>worldguard-bukkit</artifactId>
98-
<version>7.0.0</version>
99-
</dependency>
100-
<dependency>
101-
<groupId>com.sk89q.worldedit</groupId>
102-
<artifactId>worldedit-bukkit</artifactId>
103-
<version>7.0.0</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>com.sk89q</groupId>
107-
<artifactId>squirrelid</artifactId>
108-
<version>0.2.0</version>
109-
</dependency>
110-
</dependencies>
111-
<version>1.2-SNAPSHOT</version>
81+
82+
<dependencies>
83+
<dependency>
84+
<groupId>us.dynmap</groupId>
85+
<artifactId>dynmap-api</artifactId>
86+
<version>3.0-SNAPSHOT</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.spigotmc</groupId>
90+
<artifactId>spigot</artifactId>
91+
<version>1.14.4-R0.1-SNAPSHOT</version>
92+
<type>jar</type>
93+
<scope>provided</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.sk89q.worldguard</groupId>
97+
<artifactId>worldguard-bukkit</artifactId>
98+
<version>7.0.1-SNAPSHOT</version>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.sk89q.worldedit</groupId>
102+
<artifactId>worldedit-bukkit</artifactId>
103+
<version>7.1.0-SNAPSHOT</version>
104+
</dependency>
105+
<dependency>
106+
<groupId>com.sk89q</groupId>
107+
<artifactId>squirrelid</artifactId>
108+
<version>0.2.0-SNAPSHOT</version>
109+
</dependency>
110+
</dependencies>
111+
<version>1.2-SNAPSHOT</version>
112112
</project>

src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.dynmap.markers.MarkerAPI;
2727
import org.dynmap.markers.MarkerSet;
2828

29-
import com.sk89q.squirrelid.cache.ProfileCache;
3029
import com.sk89q.worldedit.math.BlockVector2;
3130
import com.sk89q.worldedit.math.BlockVector3;
3231
import com.sk89q.worldedit.world.World;
@@ -41,6 +40,7 @@
4140
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
4241
import com.sk89q.worldguard.protection.regions.RegionContainer;
4342
import com.sk89q.worldguard.protection.regions.RegionType;
43+
import com.sk89q.worldguard.util.profile.cache.ProfileCache;
4444

4545
public class DynmapWorldGuardPlugin extends JavaPlugin {
4646
private static Logger log;

0 commit comments

Comments
 (0)