diff --git a/sources/src/main/java/io/akarin/api/Akari.java b/sources/src/main/java/io/akarin/api/internal/Akari.java similarity index 98% rename from sources/src/main/java/io/akarin/api/Akari.java rename to sources/src/main/java/io/akarin/api/internal/Akari.java index eb6b0ed4d..6a076d6bc 100644 --- a/sources/src/main/java/io/akarin/api/Akari.java +++ b/sources/src/main/java/io/akarin/api/internal/Akari.java @@ -1,4 +1,4 @@ -package io.akarin.api; +package io.akarin.api.internal; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/sources/src/main/java/io/akarin/api/LocalAddress.java b/sources/src/main/java/io/akarin/api/internal/LocalAddress.java similarity index 94% rename from sources/src/main/java/io/akarin/api/LocalAddress.java rename to sources/src/main/java/io/akarin/api/internal/LocalAddress.java index f9996394d..93adeec76 100644 --- a/sources/src/main/java/io/akarin/api/LocalAddress.java +++ b/sources/src/main/java/io/akarin/api/internal/LocalAddress.java @@ -1,4 +1,4 @@ -package io.akarin.api; +package io.akarin.api.internal; import java.net.InetAddress; diff --git a/sources/src/main/java/io/akarin/api/CheckedConcurrentLinkedQueue.java b/sources/src/main/java/io/akarin/api/internal/collections/CheckedConcurrentLinkedQueue.java similarity index 99% rename from sources/src/main/java/io/akarin/api/CheckedConcurrentLinkedQueue.java rename to sources/src/main/java/io/akarin/api/internal/collections/CheckedConcurrentLinkedQueue.java index 528a18076..f9fbb5f64 100644 --- a/sources/src/main/java/io/akarin/api/CheckedConcurrentLinkedQueue.java +++ b/sources/src/main/java/io/akarin/api/internal/collections/CheckedConcurrentLinkedQueue.java @@ -33,7 +33,7 @@ * at http://creativecommons.org/publicdomain/zero/1.0/ */ -package io.akarin.api; +package io.akarin.api.internal.collections; import java.util.AbstractQueue; import java.util.ArrayList; @@ -45,6 +45,8 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Consumer; +import io.akarin.api.internal.Akari; + /** * An unbounded thread-safe {@linkplain Queue queue} based on linked nodes. * This queue orders elements FIFO (first-in-first-out). diff --git a/sources/src/main/java/io/akarin/api/WrappedCollections.java b/sources/src/main/java/io/akarin/api/internal/collections/WrappedCollections.java similarity index 99% rename from sources/src/main/java/io/akarin/api/WrappedCollections.java rename to sources/src/main/java/io/akarin/api/internal/collections/WrappedCollections.java index b6afa0962..52e812f63 100644 --- a/sources/src/main/java/io/akarin/api/WrappedCollections.java +++ b/sources/src/main/java/io/akarin/api/internal/collections/WrappedCollections.java @@ -1,4 +1,4 @@ -package io.akarin.api; +package io.akarin.api.internal.collections; import java.io.Serializable; import java.io.ObjectOutputStream; diff --git a/sources/src/main/java/io/akarin/api/mixin/IMixinChunk.java b/sources/src/main/java/io/akarin/api/internal/mixin/IMixinChunk.java similarity index 94% rename from sources/src/main/java/io/akarin/api/mixin/IMixinChunk.java rename to sources/src/main/java/io/akarin/api/internal/mixin/IMixinChunk.java index c1ab14c12..7dd2723b1 100644 --- a/sources/src/main/java/io/akarin/api/mixin/IMixinChunk.java +++ b/sources/src/main/java/io/akarin/api/internal/mixin/IMixinChunk.java @@ -1,4 +1,4 @@ -package io.akarin.api.mixin; +package io.akarin.api.internal.mixin; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/sources/src/main/java/io/akarin/api/mixin/IMixinWorldServer.java b/sources/src/main/java/io/akarin/api/internal/mixin/IMixinWorldServer.java similarity index 89% rename from sources/src/main/java/io/akarin/api/mixin/IMixinWorldServer.java rename to sources/src/main/java/io/akarin/api/internal/mixin/IMixinWorldServer.java index 0e8fbcdab..ed0860368 100644 --- a/sources/src/main/java/io/akarin/api/mixin/IMixinWorldServer.java +++ b/sources/src/main/java/io/akarin/api/internal/mixin/IMixinWorldServer.java @@ -1,4 +1,4 @@ -package io.akarin.api.mixin; +package io.akarin.api.internal.mixin; import java.util.concurrent.ExecutorService; diff --git a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java index 829f3c5ed..58a806c90 100644 --- a/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java +++ b/sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java @@ -3,6 +3,8 @@ package io.akarin.server.core; import com.google.common.base.Throwables; import com.google.common.collect.Lists; +import io.akarin.api.internal.Akari; + import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -14,7 +16,6 @@ import java.util.regex.Pattern; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -import io.akarin.api.Akari; @SuppressWarnings("unused") public class AkarinGlobalConfig { diff --git a/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java b/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java index 09273b102..0c78a44f9 100644 --- a/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java +++ b/sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java @@ -1,6 +1,6 @@ package io.akarin.server.core; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import net.minecraft.server.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.server.PacketPlayOutKeepAlive; diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java index 13301606d..ffe2da92c 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; @Mixin(value = Main.class, remap = false) diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java index dba8f82b4..fcafd087d 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import net.minecraft.server.BiomeBase; import net.minecraft.server.Block; import net.minecraft.server.BlockFire; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java index ba9d4a75f..4785d88fb 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.MinecraftServer; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java index 2adcc8732..2dc0c011a 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Overwrite; import com.mojang.authlib.GameProfile; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.CommandAbstract; import net.minecraft.server.CommandBan; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java index 59764a09c..deda36ad0 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.CommandAbstract; import net.minecraft.server.CommandBanIp; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java index 030604235..f03363103 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import co.aikar.timings.MinecraftTimings; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinSlackScheduler; import net.minecraft.server.CrashReport; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java index ad0653ad1..06175e0eb 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; @Mixin(targets = "co.aikar.timings.TimingHandler", remap = false) diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java index 148c185c6..c8961292f 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.MCUtil; diff --git a/sources/src/main/java/io/akarin/server/mixin/cps/MixinChunk.java b/sources/src/main/java/io/akarin/server/mixin/cps/MixinChunk.java index 32f2e304b..2939743c8 100644 --- a/sources/src/main/java/io/akarin/server/mixin/cps/MixinChunk.java +++ b/sources/src/main/java/io/akarin/server/mixin/cps/MixinChunk.java @@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.google.common.collect.Lists; -import io.akarin.api.mixin.IMixinChunk; +import io.akarin.api.internal.mixin.IMixinChunk; import net.minecraft.server.BlockPosition; import net.minecraft.server.Chunk; import net.minecraft.server.EnumDirection; diff --git a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java index 3913be053..4c0bc759e 100644 --- a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java +++ b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java @@ -44,9 +44,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.google.common.collect.Lists; -import io.akarin.api.Akari; -import io.akarin.api.mixin.IMixinChunk; -import io.akarin.api.mixin.IMixinWorldServer; +import io.akarin.api.internal.Akari; +import io.akarin.api.internal.mixin.IMixinChunk; +import io.akarin.api.internal.mixin.IMixinWorldServer; import net.minecraft.server.BlockPosition; import net.minecraft.server.Blocks; import net.minecraft.server.Chunk; diff --git a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java index 97ff1d842..61fff71e5 100644 --- a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java @@ -30,7 +30,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.Redirect; -import io.akarin.api.mixin.IMixinChunk; +import io.akarin.api.internal.mixin.IMixinChunk; import net.minecraft.server.ChunkProviderServer; import net.minecraft.server.WorldServer; diff --git a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java index b756a01bd..035d4858e 100644 --- a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java @@ -32,9 +32,9 @@ import javax.annotation.Nullable; import org.spongepowered.asm.mixin.Mixin; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.akarin.api.Akari; -import io.akarin.api.mixin.IMixinChunk; -import io.akarin.api.mixin.IMixinWorldServer; +import io.akarin.api.internal.Akari; +import io.akarin.api.internal.mixin.IMixinChunk; +import io.akarin.api.internal.mixin.IMixinWorldServer; import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.BlockPosition; import net.minecraft.server.Chunk; diff --git a/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java index 3a68a7d5f..41de9c1de 100644 --- a/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java +++ b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java @@ -17,8 +17,8 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import com.google.common.collect.Lists; -import io.akarin.api.Akari; -import io.akarin.api.LocalAddress; +import io.akarin.api.internal.Akari; +import io.akarin.api.internal.LocalAddress; import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.ChannelAdapter; import io.netty.bootstrap.ServerBootstrap; diff --git a/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java index 2c3ef03ce..6d8dff8e7 100644 --- a/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java +++ b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import io.akarin.api.CheckedConcurrentLinkedQueue; +import io.akarin.api.internal.collections.CheckedConcurrentLinkedQueue; import io.netty.channel.Channel; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; diff --git a/sources/src/main/java/net/minecraft/server/NetworkManager.java b/sources/src/main/java/net/minecraft/server/NetworkManager.java index a67a2ac09..ed621ffe5 100644 --- a/sources/src/main/java/net/minecraft/server/NetworkManager.java +++ b/sources/src/main/java/net/minecraft/server/NetworkManager.java @@ -2,7 +2,7 @@ package net.minecraft.server; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.akarin.api.CheckedConcurrentLinkedQueue; +import io.akarin.api.internal.collections.CheckedConcurrentLinkedQueue; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; diff --git a/sources/src/main/java/net/minecraft/server/PlayerConnection.java b/sources/src/main/java/net/minecraft/server/PlayerConnection.java index c3e505ee9..c75ba3ca7 100644 --- a/sources/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/sources/src/main/java/net/minecraft/server/PlayerConnection.java @@ -3,7 +3,7 @@ package net.minecraft.server; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; diff --git a/sources/src/main/java/net/minecraft/server/PlayerList.java b/sources/src/main/java/net/minecraft/server/PlayerList.java index bc687bbf9..ffdd4e4b6 100644 --- a/sources/src/main/java/net/minecraft/server/PlayerList.java +++ b/sources/src/main/java/net/minecraft/server/PlayerList.java @@ -6,7 +6,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; -import io.akarin.api.Akari; +import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; import io.netty.buffer.Unpooled; import java.io.File;