Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions orebfuscator-common/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<version>${dependency.bukkit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.imprex</groupId>
<artifactId>orebfuscator-common</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.imprex</groupId>
<artifactId>orebfuscator-nms-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import dev.imprex.orebfuscator.config.api.Config;
import dev.imprex.orebfuscator.logging.OfcLogger;
import dev.imprex.orebfuscator.util.ChunkPosition;
import dev.imprex.orebfuscator.util.MinecraftVersion;
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
import net.imprex.orebfuscator.config.Config;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.util.MinecraftVersion;
import net.imprex.orebfuscator.util.OFCLogger;
import net.imprex.orebfuscator.util.ServerVersion;

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

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

OFCLogger.debug("Compatibility layer successfully loaded");
OfcLogger.debug("Compatibility layer successfully loaded");
}

public static boolean isGameThread() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import org.bukkit.World;

import dev.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.imprex.orebfuscator.util.ChunkPosition;

public interface CompatibilityLayer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import org.bukkit.World;
import org.bukkit.plugin.Plugin;

import dev.imprex.orebfuscator.config.api.Config;
import dev.imprex.orebfuscator.util.ChunkDirection;
import dev.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.OrebfuscatorNms;
import net.imprex.orebfuscator.config.Config;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.imprex.orebfuscator.util.ChunkDirection;
import net.imprex.orebfuscator.util.ChunkPosition;

public class BukkitChunkLoader implements Runnable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import org.bukkit.World;
import org.bukkit.plugin.Plugin;

import dev.imprex.orebfuscator.config.api.Config;
import dev.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
import net.imprex.orebfuscator.config.Config;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.imprex.orebfuscator.util.ChunkPosition;

public class BukkitCompatibilityLayer implements CompatibilityLayer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import org.bukkit.plugin.Plugin;

import dev.imprex.orebfuscator.config.api.Config;
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
import net.imprex.orebfuscator.compatibility.paper.AbstractPaperCompatibilityLayer;
import net.imprex.orebfuscator.config.Config;

public class FoliaCompatibilityLayer extends AbstractPaperCompatibilityLayer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

import org.bukkit.World;

import dev.imprex.orebfuscator.util.ChunkDirection;
import dev.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.OrebfuscatorNms;
import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.imprex.orebfuscator.util.ChunkDirection;
import net.imprex.orebfuscator.util.ChunkPosition;

public abstract class AbstractPaperCompatibilityLayer implements CompatibilityLayer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import org.bukkit.plugin.Plugin;

import dev.imprex.orebfuscator.config.api.Config;
import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
import net.imprex.orebfuscator.compatibility.bukkit.BukkitScheduler;
import net.imprex.orebfuscator.config.Config;

public class PaperCompatibilityLayer extends AbstractPaperCompatibilityLayer {

Expand Down
41 changes: 41 additions & 0 deletions orebfuscator-core/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.imprex</groupId>
<artifactId>orebfuscator</artifactId>
<version>${revision}</version>
</parent>

<groupId>dev.imprex.orebfuscator</groupId>
<artifactId>orebfuscator-core</artifactId>
<packaging>jar</packaging>

<dependencies>
<!-- Netty -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${dependency.netty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${dependency.netty.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>${dependency.bukkit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.joml</groupId>
<artifactId>joml</artifactId>
<version>${dependency.joml.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.nms;
package dev.imprex.orebfuscator.cache;

import java.io.DataInputStream;
import java.io.DataOutputStream;
Expand All @@ -10,9 +10,9 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;

import net.imprex.orebfuscator.config.CacheConfig;
import net.imprex.orebfuscator.util.ChunkPosition;
import net.imprex.orebfuscator.util.SimpleCache;
import dev.imprex.orebfuscator.config.api.CacheConfig;
import dev.imprex.orebfuscator.util.ChunkPosition;
import dev.imprex.orebfuscator.util.SimpleCache;

public abstract class AbstractRegionFileCache<T> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.chunk;
package dev.imprex.orebfuscator.chunk;

import io.netty.buffer.ByteBuf;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.chunk;
package dev.imprex.orebfuscator.chunk;

import io.netty.buffer.ByteBuf;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.chunk;
package dev.imprex.orebfuscator.chunk;

import io.netty.buffer.ByteBuf;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.chunk;
package dev.imprex.orebfuscator.chunk;

public interface VarBitBuffer {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.chunk;
package dev.imprex.orebfuscator.chunk;

public class ZeroVarBitBuffer implements VarBitBuffer {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

public interface AdvancedConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

public interface BlockFlags {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

import java.nio.file.Path;

import net.imprex.orebfuscator.util.ChunkPosition;
import dev.imprex.orebfuscator.util.ChunkPosition;

public interface CacheConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

import org.bukkit.World;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

public interface GeneralConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

import net.imprex.orebfuscator.util.BlockProperties;
import dev.imprex.orebfuscator.util.BlockProperties;

public interface ObfuscationConfig extends WorldConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

import java.util.Map;

import org.joml.Matrix4f;

import net.imprex.orebfuscator.util.BlockProperties;
import dev.imprex.orebfuscator.util.BlockProperties;

public interface ProximityConfig extends WorldConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

public interface WorldConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config;
package dev.imprex.orebfuscator.config.api;

public interface WorldConfigBundle {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config.components;
package dev.imprex.orebfuscator.config.components;

import java.util.function.Predicate;
import java.util.regex.Pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config.context;
package dev.imprex.orebfuscator.config.context;

public interface ConfigParsingContext {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.imprex.orebfuscator.config.context;
package dev.imprex.orebfuscator.config.context;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -7,7 +7,7 @@
import java.util.Map;
import java.util.logging.Level;

import net.imprex.orebfuscator.util.OFCLogger;
import dev.imprex.orebfuscator.logging.OfcLogger;

public class DefaultConfigParsingContext implements ConfigParsingContext {

Expand Down Expand Up @@ -143,7 +143,7 @@ public String report() {
.append(ANSI_RESET);

String message = builder.toString();
OFCLogger.log(hasErrors() ? Level.SEVERE : Level.WARNING, message);
OfcLogger.log(hasErrors() ? Level.SEVERE : Level.WARNING, message);
return message;
}

Expand Down
Loading