diff --git a/.gitignore b/.gitignore index a3989e87..591dd61c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ package-lock.json node_modules .gradle +bin build target/* diff --git a/iclibs/android.jar b/iclibs/android.jar index c42c2e00..7e8de2c8 100644 Binary files a/iclibs/android.jar and b/iclibs/android.jar differ diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index fe608383..3c9386e3 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -2,12 +2,14 @@ package com.reider745; import cn.nukkit.Server; import cn.nukkit.plugin.PluginDescription; + import com.reider745.api.CallbackHelper; import com.reider745.block.CustomBlock; import com.reider745.commands.CommandsHelper; import com.reider745.event.EventListener; import com.reider745.event.InnerCorePlugin; import com.reider745.item.CustomItem; + import com.zhekasmirnov.apparatus.adapter.innercore.PackInfo; import com.zhekasmirnov.apparatus.api.container.ItemContainer; import com.zhekasmirnov.apparatus.api.player.NetworkPlayerRegistry; @@ -31,12 +33,14 @@ import com.zhekasmirnov.innercore.mod.build.ModLoader; import com.zhekasmirnov.innercore.modpack.ModPackContext; import com.zhekasmirnov.innercore.modpack.ModPackFactory; import com.zhekasmirnov.innercore.utils.FileTools; + import org.json.JSONObject; import java.io.*; import java.net.URI; import java.net.URISyntaxException; import java.nio.file.*; +import java.nio.file.FileSystem; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -77,8 +81,8 @@ public class InnerCoreServer { } public static File cloneFile(String name, String path) { + final File file = new File(name); try { - final File file = new File(name); if (!file.exists()) { BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(path)); BufferedInputStream bis = new BufferedInputStream(classLoader.getResourceAsStream(name)); @@ -89,7 +93,11 @@ public class InnerCoreServer { } return file; } catch (Exception e) { - e.printStackTrace(); + try { + file.delete(); + } catch (SecurityException se) { + } + server.getLogger().warning("Resource '" + name + "' cannot be accessed: " + e.getMessage()); } return null; } @@ -224,7 +232,7 @@ public class InnerCoreServer { final File innercoreDirectory = new File(PATH, "innercore"); if (!innercoreDirectory.exists()) { server.getLogger().info("Extracting internal package..."); - final File zipFile = cloneFile("innercore.zip");//но у нас нет в ресурсах innercore.zip :D + final File zipFile = cloneFile("innercore.zip");// но у нас нет в ресурсах innercore.zip :D if (zipFile != null) { unzip(new ZipFile(zipFile), PATH); try { @@ -297,7 +305,6 @@ public class InnerCoreServer { public void start() { } - public static int getVersionCode() { return server.getPropertyInt("inner-core-version", 152); } diff --git a/src/main/java/com/reider745/api/hooks/RebuildJavadoc.java b/src/main/java/com/reider745/api/hooks/RebuildJavadoc.java index 8aa45842..011b0387 100644 --- a/src/main/java/com/reider745/api/hooks/RebuildJavadoc.java +++ b/src/main/java/com/reider745/api/hooks/RebuildJavadoc.java @@ -129,6 +129,7 @@ public class RebuildJavadoc { ctClass.defrost(); } boolean isEnum = ctClass.isEnum(); + boolean isInterface = ctClass.isInterface(); String classSignature = null; if (isEnum) { classSignature = ctClass.getName().replace(".", "/"); @@ -147,6 +148,9 @@ public class RebuildJavadoc { } } } + if (isInterface && method.isEmpty()) { + continue; + } String desiredValue = "null"; try { desiredValue = getStubReturnForMethod(method); @@ -174,7 +178,7 @@ public class RebuildJavadoc { if (ctClass.isFrozen()) { ctClass.defrost(); } - if (ctClass.isEnum()) { + if (ctClass.isEnum() || ctClass.isInterface()) { return; } CtConstructor minimumConstructor = getMinimumConstructor(ctClass.getDeclaredConstructors()); @@ -222,7 +226,7 @@ public class RebuildJavadoc { } try { CtClass returnClass = method.getReturnType(); - if (returnClass.isEnum()) { + if (returnClass.isEnum() || returnClass.isInterface()) { continue; } String returnType = returnClass.getName(); diff --git a/src/main/java/com/reider745/hooks/Other.java b/src/main/java/com/reider745/hooks/Other.java index d9e8b498..8d6ab652 100644 --- a/src/main/java/com/reider745/hooks/Other.java +++ b/src/main/java/com/reider745/hooks/Other.java @@ -1,28 +1,13 @@ package com.reider745.hooks; -import cn.nukkit.Player; -import cn.nukkit.inventory.CraftingGrid; -import cn.nukkit.inventory.Inventory; -import cn.nukkit.inventory.PlayerUIInventory; -import cn.nukkit.inventory.ShapedRecipe; -import cn.nukkit.inventory.transaction.action.SlotChangeAction; -import cn.nukkit.item.Item; -import com.reider745.api.hooks.ArgumentTypes; import com.reider745.api.hooks.HookClass; -import com.reider745.api.hooks.HookController; -import com.reider745.api.hooks.TypeHook; import com.reider745.api.hooks.annotation.Hooks; import com.reider745.api.hooks.annotation.Inject; -import com.reider745.workbench.Workbench; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; @Hooks public class Other implements HookClass { @Inject(class_name = "org.mozilla.javascript.ScriptRuntime") - public static String[] getTopPackageNames(){ - return new String[] {"java", "javax", "org", "com", "edu", "net", "android"}; + public static String[] getTopPackageNames() { + return new String[] { "java", "javax", "org", "com", "edu", "net", "android" }; } } diff --git a/src/main/java/com/zhekasmirnov/horizon/runtime/logger/Logger.java b/src/main/java/com/zhekasmirnov/horizon/runtime/logger/Logger.java index 1ae80268..52218e5f 100644 --- a/src/main/java/com/zhekasmirnov/horizon/runtime/logger/Logger.java +++ b/src/main/java/com/zhekasmirnov/horizon/runtime/logger/Logger.java @@ -4,22 +4,28 @@ import cn.nukkit.Server; public class Logger { public static Server server; - public static void debug(String debug){ - server.getLogger().info(debug); + + public static void debug(String message) { + server.getLogger().info(message); } - public static void debug(String title, String debug){ - server.getLogger().info("["+title+"]"+debug); + + public static void debug(String tag, String message) { + server.getLogger().info("[" + tag + "] " + message); } - public static void error(String debug){ - server.getLogger().info(debug); + + public static void error(String message) { + server.getLogger().error(message); } - public static void error(String title, String debug){ - server.getLogger().error("["+title+"]"+debug); + + public static void error(String tag, String message) { + server.getLogger().error("[" + tag + "] " + message); } - public static void error(String title, Exception e){ - server.getLogger().error("["+title+"]", e); + + public static void error(String tag, Exception exc) { + server.getLogger().error("[" + tag + "] ", exc); } - public static void info(String title, String info){ - server.getLogger().info("["+title+"]"+info); + + public static void info(String tag, String message) { + server.getLogger().info("[" + tag + "] " + message); } } diff --git a/src/main/java/com/zhekasmirnov/horizon/util/FileUtils.java b/src/main/java/com/zhekasmirnov/horizon/util/FileUtils.java index 81714369..f708e1e3 100644 --- a/src/main/java/com/zhekasmirnov/horizon/util/FileUtils.java +++ b/src/main/java/com/zhekasmirnov/horizon/util/FileUtils.java @@ -7,31 +7,32 @@ import java.util.ArrayList; import java.util.List; public class FileUtils { - public static JSONObject readJSON(File file){ - try{ + public static JSONObject readJSON(File file) { + try { return new JSONObject(readFileText(file)); - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e.getCause().toString()); } } public static String readFileText(File file) throws Exception { - String line; - BufferedReader reader = new BufferedReader(new FileReader(file)); - StringBuilder text = new StringBuilder(); - while ((line = reader.readLine()) != null) { - text.append(line).append("\n"); + try (BufferedReader reader = new BufferedReader(new FileReader(file))) { + StringBuilder text = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + text.append(line).append("\n"); + } + return text.toString(); } - return text.toString(); } public static void writeFileText(File file, String text) throws Exception { - PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(file, false))); - writer.write(text); - writer.close(); + try (PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(file, false)))) { + writer.write(text); + } } - public static void writeJSON(File file, JSONObject jsonObject) throws Exception{ + public static void writeJSON(File file, JSONObject jsonObject) throws Exception { String result = jsonObject.toString(); FileUtils.writeFileText(file, result); } @@ -44,9 +45,11 @@ public class FileUtils { return path; } - private static void getAllRelativePaths(File file, File directoryBase, List result, boolean addDirectories) { + private static void getAllRelativePaths(File file, File directoryBase, List result, + boolean addDirectories) { if (addDirectories || file.isFile()) { - result.add(FileUtils.cleanupPath(file.getAbsolutePath().substring(directoryBase.getAbsolutePath().length()))); + result.add( + FileUtils.cleanupPath(file.getAbsolutePath().substring(directoryBase.getAbsolutePath().length()))); } if (file.isDirectory()) { for (File child : file.listFiles()) { @@ -56,12 +59,11 @@ public class FileUtils { } public static List getAllRelativePaths(File directory, boolean addDirectories) { - ArrayList result = new ArrayList(); - FileUtils.getAllRelativePaths(directory, directory, (List)result, addDirectories); + ArrayList result = new ArrayList<>(); + FileUtils.getAllRelativePaths(directory, directory, result, addDirectories); return result; } - public static boolean getFileFlag(File directory, String name) { return new File(directory, "." + name).exists(); } @@ -72,9 +74,8 @@ public class FileUtils { if (!flag.exists()) { try { flag.createNewFile(); - } - catch (IOException e) { - throw new RuntimeException("failed to set flag: " + (Object)flag, (Throwable)e); + } catch (IOException e) { + throw new RuntimeException("failed to set flag: " + (Object) flag, (Throwable) e); } } } else {