Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

rename api package

Browse Source
This commit is contained in:
Sotr
2018-06-14 01:04:20 +08:00
parent f45908ae38
commit db54c87abd
25 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/src/main/java/io/akarin/api/Akari.java → sources/src/main/java/io/akarin/api/internal/Akari.java
View File

@@ -1,4 +1,4 @@
package io.akarin.api; package io.akarin.api.internal;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

2
sources/src/main/java/io/akarin/api/LocalAddress.java → sources/src/main/java/io/akarin/api/internal/LocalAddress.java
View File

@@ -1,4 +1,4 @@
package io.akarin.api; package io.akarin.api.internal;
import java.net.InetAddress; import java.net.InetAddress;

4
sources/src/main/java/io/akarin/api/CheckedConcurrentLinkedQueue.java → sources/src/main/java/io/akarin/api/internal/collections/CheckedConcurrentLinkedQueue.java
View File

@@ -33,7 +33,7 @@
* at http://creativecommons.org/publicdomain/zero/1.0/ * 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.AbstractQueue;
import java.util.ArrayList; import java.util.ArrayList;
@@ -45,6 +45,8 @@ import java.util.Spliterator;
import java.util.Spliterators; import java.util.Spliterators;
import java.util.function.Consumer; import java.util.function.Consumer;
import io.akarin.api.internal.Akari;
/** /**
* An unbounded thread-safe {@linkplain Queue queue} based on linked nodes. * An unbounded thread-safe {@linkplain Queue queue} based on linked nodes.
* This queue orders elements FIFO (first-in-first-out). * This queue orders elements FIFO (first-in-first-out).

2
sources/src/main/java/io/akarin/api/WrappedCollections.java → sources/src/main/java/io/akarin/api/internal/collections/WrappedCollections.java
View File

@@ -1,4 +1,4 @@
package io.akarin.api; package io.akarin.api.internal.collections;
import java.io.Serializable; import java.io.Serializable;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;

2
sources/src/main/java/io/akarin/api/mixin/IMixinChunk.java → sources/src/main/java/io/akarin/api/internal/mixin/IMixinChunk.java
View File

@@ -1,4 +1,4 @@
package io.akarin.api.mixin; package io.akarin.api.internal.mixin;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;

2
sources/src/main/java/io/akarin/api/mixin/IMixinWorldServer.java → sources/src/main/java/io/akarin/api/internal/mixin/IMixinWorldServer.java
View File

@@ -1,4 +1,4 @@
package io.akarin.api.mixin; package io.akarin.api.internal.mixin;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;

3
sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
View File

@@ -3,6 +3,8 @@ package io.akarin.server.core;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import io.akarin.api.internal.Akari;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@@ -14,7 +16,6 @@ import java.util.regex.Pattern;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import io.akarin.api.Akari;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class AkarinGlobalConfig { public class AkarinGlobalConfig {

2
sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java
View File

@@ -1,6 +1,6 @@
package io.akarin.server.core; 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.EntityPlayer;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PacketPlayOutKeepAlive; import net.minecraft.server.PacketPlayOutKeepAlive;

2
sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java
View File

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; 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; import io.akarin.server.core.AkarinGlobalConfig;
@Mixin(value = Main.class, remap = false) @Mixin(value = Main.class, remap = false)

2
sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java
View File

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; 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.BiomeBase;
import net.minecraft.server.Block; import net.minecraft.server.Block;
import net.minecraft.server.BlockFire; import net.minecraft.server.BlockFire;

2
sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java
View File

@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java
View File

@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Overwrite;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.CommandAbstract; import net.minecraft.server.CommandAbstract;
import net.minecraft.server.CommandBan; import net.minecraft.server.CommandBan;

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java
View File

@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.CommandAbstract; import net.minecraft.server.CommandAbstract;
import net.minecraft.server.CommandBanIp; import net.minecraft.server.CommandBanIp;

2
sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java
View File

@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import co.aikar.timings.MinecraftTimings; 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.AkarinGlobalConfig;
import io.akarin.server.core.AkarinSlackScheduler; import io.akarin.server.core.AkarinSlackScheduler;
import net.minecraft.server.CrashReport; import net.minecraft.server.CrashReport;

2
sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java
View File

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
@Mixin(targets = "co.aikar.timings.TimingHandler", remap = false) @Mixin(targets = "co.aikar.timings.TimingHandler", remap = false)

2
sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java
View File

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.MCUtil; import net.minecraft.server.MCUtil;

2
sources/src/main/java/io/akarin/server/mixin/cps/MixinChunk.java
View File

@@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.google.common.collect.Lists; 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.BlockPosition;
import net.minecraft.server.Chunk; import net.minecraft.server.Chunk;
import net.minecraft.server.EnumDirection; import net.minecraft.server.EnumDirection;

6
sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java
View File

@@ -44,9 +44,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.api.mixin.IMixinChunk; import io.akarin.api.internal.mixin.IMixinChunk;
import io.akarin.api.mixin.IMixinWorldServer; import io.akarin.api.internal.mixin.IMixinWorldServer;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import net.minecraft.server.Blocks; import net.minecraft.server.Blocks;
import net.minecraft.server.Chunk; import net.minecraft.server.Chunk;

2
sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java
View File

@@ -30,7 +30,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Redirect; 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.ChunkProviderServer;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;

6
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java
View File

@@ -32,9 +32,9 @@ import javax.annotation.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.api.mixin.IMixinChunk; import io.akarin.api.internal.mixin.IMixinChunk;
import io.akarin.api.mixin.IMixinWorldServer; import io.akarin.api.internal.mixin.IMixinWorldServer;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import net.minecraft.server.Chunk; import net.minecraft.server.Chunk;

4
sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java
View File

@@ -17,8 +17,8 @@ import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.api.LocalAddress; import io.akarin.api.internal.LocalAddress;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import io.akarin.server.core.ChannelAdapter; import io.akarin.server.core.ChannelAdapter;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;

2
sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java
View File

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; 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.channel.Channel;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GenericFutureListener;

2
sources/src/main/java/net/minecraft/server/NetworkManager.java
View File

@@ -2,7 +2,7 @@ package net.minecraft.server;
import com.google.common.util.concurrent.ThreadFactoryBuilder; 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.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;

2
sources/src/main/java/net/minecraft/server/PlayerConnection.java
View File

@@ -3,7 +3,7 @@ package net.minecraft.server;
import com.google.common.primitives.Doubles; import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats; 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.akarin.server.core.AkarinGlobalConfig;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GenericFutureListener;

2
sources/src/main/java/net/minecraft/server/PlayerList.java
View File

@@ -6,7 +6,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import io.akarin.api.Akari; import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import java.io.File; import java.io.File;