Skip to content

Commit f45e6d0

Browse files
Ingrim4Ingrim4
committed
chore: move some classes to new platform core module
1 parent 343d880 commit f45e6d0

File tree

136 files changed

+507
-472
lines changed

Some content is hidden

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

136 files changed

+507
-472
lines changed

‎orebfuscator-common/pom.xml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎orebfuscator-compatibility/orebfuscator-compatibility-api/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919
<version>${dependency.bukkit.version}</version>
2020
<scope>provided</scope>
2121
</dependency>
22-
<dependency>
23-
<groupId>net.imprex</groupId>
24-
<artifactId>orebfuscator-common</artifactId>
25-
<version>${revision}</version>
26-
<scope>compile</scope>
27-
</dependency>
2822
<dependency>
2923
<groupId>net.imprex</groupId>
3024
<artifactId>orebfuscator-nms-api</artifactId>

‎orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import org.bukkit.entity.Player;
88
import org.bukkit.plugin.Plugin;
99

10+
import dev.imprex.orebfuscator.config.api.Config;
11+
import dev.imprex.orebfuscator.logging.OfcLogger;
12+
import dev.imprex.orebfuscator.util.ChunkPosition;
13+
import dev.imprex.orebfuscator.util.MinecraftVersion;
1014
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
11-
import net.imprex.orebfuscator.config.Config;
1215
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
13-
import net.imprex.orebfuscator.util.ChunkPosition;
14-
import net.imprex.orebfuscator.util.MinecraftVersion;
15-
import net.imprex.orebfuscator.util.OFCLogger;
1616
import net.imprex.orebfuscator.util.ServerVersion;
1717

1818
public class OrebfuscatorCompatibility {
@@ -32,7 +32,7 @@ public static void initialize(Plugin plugin, Config config) {
3232
}
3333

3434
try {
35-
OFCLogger.debug("Loading compatibility layer for: " + className);
35+
OfcLogger.debug("Loading compatibility layer for: " + className);
3636
Class<? extends CompatibilityLayer> nmsManager = Class.forName(className).asSubclass(CompatibilityLayer.class);
3737
Constructor<? extends CompatibilityLayer> constructor = nmsManager.getConstructor(Plugin.class, Config.class);
3838
OrebfuscatorCompatibility.instance = constructor.newInstance(plugin, config);
@@ -42,7 +42,7 @@ public static void initialize(Plugin plugin, Config config) {
4242
throw new RuntimeException("Couldn't initialize compatibility layer", e);
4343
}
4444

45-
OFCLogger.debug("Compatibility layer successfully loaded");
45+
OfcLogger.debug("Compatibility layer successfully loaded");
4646
}
4747

4848
public static boolean isGameThread() {

‎orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import org.bukkit.World;
66

7+
import dev.imprex.orebfuscator.util.ChunkPosition;
78
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
8-
import net.imprex.orebfuscator.util.ChunkPosition;
99

1010
public interface CompatibilityLayer {
1111

‎orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitChunkLoader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import org.bukkit.World;
1010
import org.bukkit.plugin.Plugin;
1111

12+
import dev.imprex.orebfuscator.config.api.Config;
13+
import dev.imprex.orebfuscator.util.ChunkDirection;
14+
import dev.imprex.orebfuscator.util.ChunkPosition;
1215
import net.imprex.orebfuscator.OrebfuscatorNms;
13-
import net.imprex.orebfuscator.config.Config;
1416
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
15-
import net.imprex.orebfuscator.util.ChunkDirection;
16-
import net.imprex.orebfuscator.util.ChunkPosition;
1717

1818
public class BukkitChunkLoader implements Runnable {
1919

‎orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitCompatibilityLayer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import org.bukkit.World;
66
import org.bukkit.plugin.Plugin;
77

8+
import dev.imprex.orebfuscator.config.api.Config;
9+
import dev.imprex.orebfuscator.util.ChunkPosition;
810
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
911
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
10-
import net.imprex.orebfuscator.config.Config;
1112
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
12-
import net.imprex.orebfuscator.util.ChunkPosition;
1313

1414
public class BukkitCompatibilityLayer implements CompatibilityLayer {
1515

‎orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import org.bukkit.plugin.Plugin;
44

5+
import dev.imprex.orebfuscator.config.api.Config;
56
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
67
import net.imprex.orebfuscator.compatibility.paper.AbstractPaperCompatibilityLayer;
7-
import net.imprex.orebfuscator.config.Config;
88

99
public class FoliaCompatibilityLayer extends AbstractPaperCompatibilityLayer {
1010

‎orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/AbstractPaperCompatibilityLayer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import org.bukkit.World;
66

7+
import dev.imprex.orebfuscator.util.ChunkDirection;
8+
import dev.imprex.orebfuscator.util.ChunkPosition;
79
import net.imprex.orebfuscator.OrebfuscatorNms;
810
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
911
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
10-
import net.imprex.orebfuscator.util.ChunkDirection;
11-
import net.imprex.orebfuscator.util.ChunkPosition;
1212

1313
public abstract class AbstractPaperCompatibilityLayer implements CompatibilityLayer {
1414

‎orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import org.bukkit.plugin.Plugin;
44

5+
import dev.imprex.orebfuscator.config.api.Config;
56
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
67
import net.imprex.orebfuscator.compatibility.bukkit.BukkitScheduler;
7-
import net.imprex.orebfuscator.config.Config;
88

99
public class PaperCompatibilityLayer extends AbstractPaperCompatibilityLayer {
1010

‎orebfuscator-core/pom.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>net.imprex</groupId>
5+
<artifactId>orebfuscator</artifactId>
6+
<version>${revision}</version>
7+
</parent>
8+
9+
<groupId>dev.imprex.orebfuscator</groupId>
10+
<artifactId>orebfuscator-core</artifactId>
11+
<packaging>jar</packaging>
12+
13+
<dependencies>
14+
<!-- Netty -->
15+
<dependency>
16+
<groupId>io.netty</groupId>
17+
<artifactId>netty-buffer</artifactId>
18+
<version>${dependency.netty.version}</version>
19+
<scope>provided</scope>
20+
</dependency>
21+
<dependency>
22+
<groupId>io.netty</groupId>
23+
<artifactId>netty-transport</artifactId>
24+
<version>${dependency.netty.version}</version>
25+
<scope>provided</scope>
26+
</dependency>
27+
28+
<dependency>
29+
<groupId>org.spigotmc</groupId>
30+
<artifactId>spigot-api</artifactId>
31+
<version>${dependency.bukkit.version}</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.joml</groupId>
36+
<artifactId>joml</artifactId>
37+
<version>${dependency.joml.version}</version>
38+
<scope>compile</scope>
39+
</dependency>
40+
</dependencies>
41+
</project>

0 commit comments

Comments
 (0)