Skip to content

Commit dec7ba0

Browse files
committed
The current version of TechUtils doesn't include Yamler
1 parent 687a39a commit dec7ba0

File tree

5 files changed

+25
-12
lines changed

5 files changed

+25
-12
lines changed

base/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
<scope>provided</scope>
2121
<optional>true</optional>
2222
</dependency>
23+
<!-- The current version of TechUtils doesn't include Yamler -->
24+
<dependency>
25+
<groupId>net.cubespace</groupId>
26+
<artifactId>Yamler-Core</artifactId>
27+
<version>2.3.1-SNAPSHOT</version>
28+
<scope>compile</scope>
29+
</dependency>
2330
<!-- Classpath Scanning -->
2431
<dependency>
2532
<groupId>org.reflections</groupId>

base/src/main/java/net/techcable/spawnshield/BlockMode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
*/
2323
package net.techcable.spawnshield;
2424

25-
import lombok.RequiredArgsConstructor;
26-
import net.techcable.techutils.yamler.InternalConverter;
27-
import net.techcable.techutils.yamler.converter.Converter;
25+
26+
import net.cubespace.Yamler.Config.Converter.Converter;
27+
import net.cubespace.Yamler.Config.InternalConverter;
2828

2929
import java.lang.reflect.ParameterizedType;
3030

base/src/main/java/net/techcable/spawnshield/config/SpawnShieldConfig.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,15 @@
2828
import lombok.AccessLevel;
2929
import lombok.Getter;
3030
import lombok.Synchronized;
31+
import net.cubespace.Yamler.Config.Comments;
32+
import net.cubespace.Yamler.Config.Config;
33+
import net.cubespace.Yamler.Config.InvalidConfigurationException;
34+
import net.cubespace.Yamler.Config.InvalidConverterException;
3135
import net.techcable.spawnshield.BlockMode;
3236
import net.techcable.spawnshield.SpawnShield;
3337
import net.techcable.spawnshield.Utils;
3438
import net.techcable.spawnshield.compat.ProtectionPlugin;
3539
import net.techcable.spawnshield.compat.Region;
36-
import net.techcable.techutils.collect.Pair;
37-
import net.techcable.techutils.yamler.Comments;
38-
import net.techcable.techutils.yamler.Config;
39-
import net.techcable.techutils.yamler.InvalidConfigurationException;
40-
import net.techcable.techutils.yamler.InvalidConverterException;
4140
import org.bukkit.Bukkit;
4241
import org.bukkit.World;
4342

base/src/main/java/net/techcable/spawnshield/config/SpawnShieldMessages.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
package net.techcable.spawnshield.config;
2424

2525
import com.google.common.base.Throwables;
26+
import net.cubespace.Yamler.Config.Comments;
27+
import net.cubespace.Yamler.Config.Config;
28+
import net.cubespace.Yamler.Config.InvalidConfigurationException;
2629
import net.techcable.spawnshield.SpawnShield;
27-
import net.techcable.techutils.collect.Pair;
28-
import net.techcable.techutils.yamler.Comments;
29-
import net.techcable.techutils.yamler.Config;
30-
import net.techcable.techutils.yamler.InvalidConfigurationException;
3130
import org.bukkit.Bukkit;
3231
import org.bukkit.ChatColor;
3332
import org.bukkit.World;

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
<id>elmakers-repo</id>
2929
<url>http://maven.elmakers.com/repository/</url>
3030
</repository>
31+
<repository>
32+
<id>md5-repo</id>
33+
<url>http://repo.md-5.net/content/groups/public/</url>
34+
</repository>
3135
</repositories>
3236
<modules>
3337
<module>api</module>
@@ -74,6 +78,10 @@
7478
<pattern>org.reflections</pattern>
7579
<shadedPattern>net.techcable.spawnshield.libs.reflections</shadedPattern>
7680
</relocation>
81+
<relocation>
82+
<pattern>net.cubespace.Yamler</pattern>
83+
<shadedPattern>net.techcable.spawnshield.libs.yamler</shadedPattern>
84+
</relocation>
7785
</relocations>
7886
</configuration>
7987
</execution>

0 commit comments

Comments
 (0)