LightAPI: Remove 'impl' packages

* Just use *Impl at the end of the name

Change-Id: I3e92bd6b3b8cc74c0cd477596df6bba6edd44666

bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/BukkitPlatformImpl.java

@@ -34,12 +34,12 @@
 
 import ru.beykerykt.minecraft.lightapi.bukkit.BukkitPlugin;
 import ru.beykerykt.minecraft.lightapi.bukkit.api.extension.IBukkitExtension;
-import ru.beykerykt.minecraft.lightapi.bukkit.internal.chunks.observer.sched.impl.BukkitScheduledChunkObserver;
-import ru.beykerykt.minecraft.lightapi.bukkit.internal.engine.sched.impl.BukkitScheduledLightEngine;
+import ru.beykerykt.minecraft.lightapi.bukkit.internal.chunks.observer.sched.BukkitScheduledChunkObserverImpl;
+import ru.beykerykt.minecraft.lightapi.bukkit.internal.engine.sched.BukkitScheduledLightEngineImpl;
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.handler.CompatibilityHandler;
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.handler.IHandler;
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.handler.IHandlerFactory;
-import ru.beykerykt.minecraft.lightapi.bukkit.internal.service.BukkitBackgroundService;
+import ru.beykerykt.minecraft.lightapi.bukkit.internal.service.BukkitBackgroundServiceImpl;
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.utils.VersionUtil;
 import ru.beykerykt.minecraft.lightapi.common.Build;
 import ru.beykerykt.minecraft.lightapi.common.api.ResultCode;
@@ -232,15 +232,15 @@ public int initialization() {
  }
 
  // init background service
- mBackgroundService = new BukkitBackgroundService(this, getHandler());
+ mBackgroundService = new BukkitBackgroundServiceImpl(this, getHandler());
  mBackgroundService.onStart();
 
  // init chunk observer
- mChunkObserver = new BukkitScheduledChunkObserver(this, getBackgroundService(), getHandler());
+ mChunkObserver = new BukkitScheduledChunkObserverImpl(this, getBackgroundService(), getHandler());
  mChunkObserver.onStart();
 
  // init light engine
- mLightEngine = new BukkitScheduledLightEngine(this, getBackgroundService(), getHandler());
+ mLightEngine = new BukkitScheduledLightEngineImpl(this, getBackgroundService(), getHandler());
  mLightEngine.onStart();
 
  // init extension
@@ -272,7 +272,7 @@ public boolean isInitialized() {
  @Override
  public void log(String msg) {
  StringBuilder builder = new StringBuilder(ChatColor.AQUA + "<LightAPI>: ");
- builder.append(ChatColor.WHITE + msg);
+ builder.append(ChatColor.WHITE).append(msg);
  mPlugin.getServer().getConsoleSender().sendMessage(builder.toString());
  }
 

bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/chunks/observer/sched/impl/BukkitScheduledChunkObserver.java → bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/chunks/observer/sched/BukkitScheduledChunkObserverImpl.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package ru.beykerykt.minecraft.lightapi.bukkit.internal.chunks.observer.sched.impl;
+package ru.beykerykt.minecraft.lightapi.bukkit.internal.chunks.observer.sched;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -36,10 +36,10 @@
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.handler.IHandler;
 import ru.beykerykt.minecraft.lightapi.common.api.ResultCode;
 import ru.beykerykt.minecraft.lightapi.common.internal.chunks.data.IChunkData;
-import ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched.impl.ScheduledChunkObserver;
+import ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched.ScheduledChunkObserverImpl;
 import ru.beykerykt.minecraft.lightapi.common.internal.service.IBackgroundService;
 
-public class BukkitScheduledChunkObserver extends ScheduledChunkObserver {
+public class BukkitScheduledChunkObserverImpl extends ScheduledChunkObserverImpl {
 
  /**
  * CONFIG
@@ -51,7 +51,7 @@ public class BukkitScheduledChunkObserver extends ScheduledChunkObserver {
  private final IHandler mHandler;
  private ScheduledFuture mScheduledFuture;
 
- public BukkitScheduledChunkObserver(BukkitPlatformImpl platform, IBackgroundService service, IHandler handler) {
+ public BukkitScheduledChunkObserverImpl(BukkitPlatformImpl platform, IBackgroundService service, IHandler handler) {
  super(platform, service);
  this.mHandler = handler;
  }
@@ -101,20 +101,20 @@ public void onShutdown() {
  }
 
  @Override
- public IChunkData createChunkData(String worldName, int chunkX, int chunkZ) {
+ protected IChunkData createChunkData(String worldName, int chunkX, int chunkZ) {
  if (!getPlatformImpl().isWorldAvailable(worldName)) {
  return null;
  }
  return getHandler().createChunkData(worldName, chunkX, chunkZ);
  }
 
  @Override
- public boolean isValidChunkSection(int sectionY) {
+ protected boolean isValidChunkSection(int sectionY) {
  return getHandler().isValidChunkSection(sectionY);
  }
 
  @Override
- public boolean isChunkLoaded(String worldName, int chunkX, int chunkZ) {
+ protected boolean isChunkLoaded(String worldName, int chunkX, int chunkZ) {
  if (!getPlatformImpl().isWorldAvailable(worldName)) {
  return false;
  }

bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/engine/sched/impl/BukkitScheduledLightEngine.java → bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/engine/sched/BukkitScheduledLightEngineImpl.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package ru.beykerykt.minecraft.lightapi.bukkit.internal.engine.sched.impl;
+package ru.beykerykt.minecraft.lightapi.bukkit.internal.engine.sched;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -38,11 +38,11 @@
 import ru.beykerykt.minecraft.lightapi.common.internal.engine.LightEngineType;
 import ru.beykerykt.minecraft.lightapi.common.internal.engine.LightEngineVersion;
 import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.IScheduler;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.impl.PriorityScheduler;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.impl.ScheduledLightEngine;
+import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.PriorityScheduler;
+import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.ScheduledLightEngineImpl;
 import ru.beykerykt.minecraft.lightapi.common.internal.service.IBackgroundService;
 
-public class BukkitScheduledLightEngine extends ScheduledLightEngine {
+public class BukkitScheduledLightEngineImpl extends ScheduledLightEngineImpl {
 
  /**
  * CONFIG
@@ -61,12 +61,12 @@ public class BukkitScheduledLightEngine extends ScheduledLightEngine {
  /**
  * @hide
  */
- public BukkitScheduledLightEngine(BukkitPlatformImpl pluginImpl, IBackgroundService service, IHandler handler) {
+ public BukkitScheduledLightEngineImpl(BukkitPlatformImpl pluginImpl, IBackgroundService service, IHandler handler) {
  this(pluginImpl, service, RelightPolicy.DEFERRED, handler, 250, 250);
  }
 
- public BukkitScheduledLightEngine(BukkitPlatformImpl pluginImpl, IBackgroundService service, RelightPolicy strategy,
- IHandler handler, int maxRequestCount, int maxTimeMsPerTick) {
+ public BukkitScheduledLightEngineImpl(BukkitPlatformImpl pluginImpl, IBackgroundService service,
+ RelightPolicy strategy, IHandler handler, int maxRequestCount, int maxTimeMsPerTick) {
  super(pluginImpl, service, strategy, maxRequestCount, maxTimeMsPerTick);
  this.mHandler = handler;
  }
@@ -122,9 +122,7 @@ private void configure() {
  maxTimeMsPerTick = fc.getInt(CONFIG_MAX_TIME_MS_IN_PER_TICK);
 
  this.mTaskId = getPlatformImpl().getPlugin().getServer().getScheduler().runTaskTimer(
- getPlatformImpl().getPlugin(), () -> {
- onTickPenaltyTime();
- }, 0, 1).getTaskId();
+ getPlatformImpl().getPlugin(), this::onTickPenaltyTime, 0, 1).getTaskId();
 
  // scheduler
  // TODO: Make config (?)

bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/service/BukkitBackgroundService.java → bukkit-common/src/main/java/ru/beykerykt/minecraft/lightapi/bukkit/internal/service/BukkitBackgroundServiceImpl.java

@@ -31,9 +31,9 @@
 
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.BukkitPlatformImpl;
 import ru.beykerykt.minecraft.lightapi.bukkit.internal.handler.IHandler;
-import ru.beykerykt.minecraft.lightapi.common.internal.service.BackgroundService;
+import ru.beykerykt.minecraft.lightapi.common.internal.service.BackgroundServiceImpl;
 
-public class BukkitBackgroundService extends BackgroundService {
+public class BukkitBackgroundServiceImpl extends BackgroundServiceImpl {
 
  /**
  * CONFIG
@@ -49,7 +49,7 @@ public class BukkitBackgroundService extends BackgroundService {
  private int taskId = -1;
  private long lastAliveTime = 0;
 
- public BukkitBackgroundService(BukkitPlatformImpl platform, IHandler handler) {
+ public BukkitBackgroundServiceImpl(BukkitPlatformImpl platform, IHandler handler) {
  mPlatform = platform;
  mHandler = handler;
  }

common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/chunks/observer/sched/impl/ScheduledChunkObserver.java → common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/chunks/observer/sched/ScheduledChunkObserverImpl.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched.impl;
+package ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,17 +30,16 @@
 import ru.beykerykt.minecraft.lightapi.common.api.ResultCode;
 import ru.beykerykt.minecraft.lightapi.common.internal.IPlatformImpl;
 import ru.beykerykt.minecraft.lightapi.common.internal.chunks.data.IChunkData;
-import ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched.IScheduledChunkObserver;
 import ru.beykerykt.minecraft.lightapi.common.internal.service.IBackgroundService;
 
-public abstract class ScheduledChunkObserver implements IScheduledChunkObserver {
+public abstract class ScheduledChunkObserverImpl implements IScheduledChunkObserver {
 
  private final IBackgroundService mBackgroundService;
  private final Map<Long, IChunkData> observedChunks = new HashMap<>();
  private final IPlatformImpl mPlatformImpl;
  private boolean isBusy = false;
 
- public ScheduledChunkObserver(IPlatformImpl platform, IBackgroundService service) {
+ public ScheduledChunkObserverImpl(IPlatformImpl platform, IBackgroundService service) {
  this.mPlatformImpl = platform;
  this.mBackgroundService = service;
  }
@@ -80,11 +79,11 @@ private long chunkCoordToLong(int chunkX, int chunkZ) {
  return l;
  }
 
- public abstract IChunkData createChunkData(String worldName, int chunkX, int chunkZ);
+ protected abstract IChunkData createChunkData(String worldName, int chunkX, int chunkZ);
 
- public abstract boolean isValidChunkSection(int sectionY);
+ protected abstract boolean isValidChunkSection(int sectionY);
 
- public abstract boolean isChunkLoaded(String worldName, int chunkX, int chunkZ);
+ protected abstract boolean isChunkLoaded(String worldName, int chunkX, int chunkZ);
 
  /* @hide */
  private int notifyUpdateChunksLocked(String worldName, int blockX, int blockY, int blockZ, int lightLevel,
@@ -93,7 +92,7 @@ private int notifyUpdateChunksLocked(String worldName, int blockX, int blockY, i
  return ResultCode.WORLD_NOT_AVAILABLE;
  }
 
- int finalLightLevel = lightLevel < 0 ? 0 : lightLevel > 15 ? 15 : lightLevel;
+ int finalLightLevel = lightLevel < 0 ? 0 : Math.min(lightLevel, 15);
 
  // start watching chunks
  int CHUNK_RADIUS = 1;

common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/engine/sched/impl/PriorityScheduler.java → common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/engine/sched/PriorityScheduler.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.impl;
+package ru.beykerykt.minecraft.lightapi.common.internal.engine.sched;
 
 import java.util.List;
 
@@ -32,10 +32,6 @@
 import ru.beykerykt.minecraft.lightapi.common.api.engine.sched.ICallback;
 import ru.beykerykt.minecraft.lightapi.common.internal.chunks.data.IChunkData;
 import ru.beykerykt.minecraft.lightapi.common.internal.chunks.observer.sched.IScheduledChunkObserver;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.IScheduledLightEngine;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.IScheduler;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.Request;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.RequestFlag;
 import ru.beykerykt.minecraft.lightapi.common.internal.service.IBackgroundService;
 import ru.beykerykt.minecraft.lightapi.common.internal.utils.FlagUtils;
 
@@ -206,8 +202,7 @@ public int handleSendRequest(Request request) {
  List<IChunkData> chunkDataList = getChunkObserver().collectChunkSections(request.getWorldName(),
  request.getBlockX(), request.getBlockY(), request.getBlockZ(),
  Math.max(request.getOldLightLevel(), request.getLightLevel()), request.getLightFlags());
- for (int i = 0; i < chunkDataList.size(); i++) {
- IChunkData data = chunkDataList.get(i);
+ for (IChunkData data : chunkDataList) {
  getChunkObserver().sendChunk(data);
  }
 

common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/engine/sched/impl/ScheduledLightEngine.java → common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/engine/sched/ScheduledLightEngineImpl.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.impl;
+package ru.beykerykt.minecraft.lightapi.common.internal.engine.sched;
 
 import java.util.Queue;
 import java.util.concurrent.PriorityBlockingQueue;
@@ -32,16 +32,12 @@
 import ru.beykerykt.minecraft.lightapi.common.api.engine.SendPolicy;
 import ru.beykerykt.minecraft.lightapi.common.api.engine.sched.ICallback;
 import ru.beykerykt.minecraft.lightapi.common.internal.IPlatformImpl;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.IScheduledLightEngine;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.IScheduler;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.Request;
-import ru.beykerykt.minecraft.lightapi.common.internal.engine.sched.RequestFlag;
 import ru.beykerykt.minecraft.lightapi.common.internal.service.IBackgroundService;
 
 /**
  * Abstract class for scheduled light engines
  */
-public abstract class ScheduledLightEngine implements IScheduledLightEngine {
+public abstract class ScheduledLightEngineImpl implements IScheduledLightEngine {
 
  private final IBackgroundService mBackgroundService;
  private final long TICK_MS = 50;
@@ -59,7 +55,7 @@ public abstract class ScheduledLightEngine implements IScheduledLightEngine {
  private int requestCount = 0;
  private long penaltyTime = 0;
 
- public ScheduledLightEngine(IPlatformImpl platformImpl, IBackgroundService service, RelightPolicy strategy,
+ public ScheduledLightEngineImpl(IPlatformImpl platformImpl, IBackgroundService service, RelightPolicy strategy,
  int maxRequestCount, int maxTimeMsPerTick) {
  this.mPlatformImpl = platformImpl;
  this.mBackgroundService = service;

common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/service/BackgroundService.java → common/src/main/java/ru/beykerykt/minecraft/lightapi/common/internal/service/BackgroundServiceImpl.java

@@ -30,7 +30,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-public abstract class BackgroundService implements IBackgroundService {
+public abstract class BackgroundServiceImpl implements IBackgroundService {
  private ScheduledExecutorService executorService;
 
  protected void configureExecutorService(int corePoolSize, ThreadFactory namedThreadFactory) {