diff --git a/iclibs/Nukkit-MOT-SNAPSHOT.jar b/iclibs/Nukkit-MOT-SNAPSHOT.jar index 9a52b16b..4a5ac685 100644 Binary files a/iclibs/Nukkit-MOT-SNAPSHOT.jar and b/iclibs/Nukkit-MOT-SNAPSHOT.jar differ diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index 120402f0..b23e9137 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -3,6 +3,7 @@ package com.reider745; import cn.nukkit.Server; import cn.nukkit.plugin.PluginDescription; +import cn.nukkit.plugin.PluginManager; import com.reider745.api.CallbackHelper; import com.reider745.block.CustomBlock; import com.reider745.commands.CommandsHelper; @@ -61,7 +62,14 @@ public class InnerCoreServer { }; } - public void loadMods() { + public static String getGameLanguage() { + final String lang = server.getLanguage().getLang(); + + final StringBuilder icLang = new StringBuilder(); + for(int i = 0;i < lang.length()-1;i++) + icLang.append(lang.indexOf(i)); + + return icLang.toString(); } public void left() { @@ -281,7 +289,9 @@ public class InnerCoreServer { public void afterload() { server.getLogger().info("Registering Nukkit-MOT containment..."); - server.getPluginManager().registerEvents(new EventListener(), plugin); + + Logger.info("Register events ZotCoreLoader"); + InnerCoreServer.server.getPluginManager().registerEvents(new EventListener(), InnerCoreServer.plugin); CustomBlock.init(); CustomItem.init(); @@ -310,6 +320,7 @@ public class InnerCoreServer { } public static void useNotSupport(String name) { + if(!isDevelopMode()) return; String message = "Use not support multiplayer method " + name; if (isRuntimeException()) { throw new RuntimeException(message); diff --git a/src/main/java/com/reider745/event/EventListener.java b/src/main/java/com/reider745/event/EventListener.java index 0b170464..75edc5db 100644 --- a/src/main/java/com/reider745/event/EventListener.java +++ b/src/main/java/com/reider745/event/EventListener.java @@ -42,14 +42,13 @@ public class EventListener implements Listener { CallbackHelper.apply(event, apply,false); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler public void use(PlayerInteractEvent event) { Vector3 pos = event.getTouchVector(); Block block = event.getBlock(); Player player = event.getPlayer(); - PlayerInteractEvent.Action action = event.getAction(); - if (action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) + if (event.getAction() == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) preventedCallback(event, () -> NativeCallback.onItemUsed((int) block.x, (int) block.y, (int) block.z, event.getFace().getIndex(), (float) pos.x, (float) pos.y, (float) pos.z, true, @@ -62,14 +61,14 @@ public class EventListener implements Listener { event.getFace().getIndex(), event.getPlayer().getId()), isNukkitPrevent); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler public void playerEat(PlayerEatFoodEvent event) { Food food = event.getFood(); preventedCallback(event, () -> NativeCallback.onPlayerEat(food.getRestoreFood(), food.getRestoreSaturation(), event.getPlayer().getId())); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler public void placeBlock(BlockPlaceEvent event) { Block block = event.getBlock(); preventedCallback(event, () -> NativeCallback.onBlockBuild((int) block.x, (int) block.y, (int) block.z, 0, diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java index 1f4eed1a..0ee12095 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java @@ -44,8 +44,7 @@ public class NativeAPI { } public static String getGameLanguage() { - // InnerCoreServer.useNotCurrentSupport("NativeAPI.getGameLanguage()"); - return "en"; + return InnerCoreServer.getGameLanguage(); } public static void preventPendingAppEvent(int event, int timeout) { diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeCallback.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeCallback.java index cc4a0758..14d0af78 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeCallback.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeCallback.java @@ -5,6 +5,7 @@ import cn.nukkit.level.Level; import com.reider745.InnerCoreServer; import com.reider745.entity.EntityMethod; +import com.reider745.event.EventListener; import com.zhekasmirnov.apparatus.adapter.innercore.EngineConfig; import com.zhekasmirnov.apparatus.adapter.innercore.game.Minecraft; import com.zhekasmirnov.apparatus.adapter.innercore.game.block.BlockBreakResult;