From b5db3ca6af3b4e1e97535224e4ca05767705b5b1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 3 Oct 2023 14:58:24 -0400 Subject: [PATCH] Removed useless code from ScriptMainGenerator --- .../mindustry/tools/ScriptMainGenerator.java | 53 +------------------ 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 1c84083efe..75dd91d181 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -18,9 +18,6 @@ import mindustry.world.*; import java.io.*; import java.lang.reflect.*; -import java.net.*; -import java.util.*; -import java.util.zip.*; public class ScriptMainGenerator{ @@ -116,53 +113,7 @@ public class ScriptMainGenerator{ } public static Seq getClasses(String packageName) throws Exception{ - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - - Seq dirs = new Seq<>(); - - for(URL resource : Collections.list(classLoader.getResources(packageName.replace('.', '/')))){ - dirs.add(new File(resource.getFile())); - } - - Seq classes = new Seq<>(); - for(File directory : dirs){ - classes.addAll(findClasses(directory, packageName)); - } - return classes; - } - - public static Seq findClasses(File directory, String packageName) throws Exception{ - Seq classes = new Seq<>(); - String dir = directory.toString(); - if(dir.startsWith("file:")){ - directory = new File(dir.substring("file:".length()).replace("!/arc", "").replace("!/mindustry", "")); - } - if(!directory.exists()) return classes; - - if(directory.getName().endsWith(".jar")){ - ZipInputStream zip = new ZipInputStream(new FileInputStream(directory)); - for(ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry()){ - if(!entry.isDirectory() && entry.getName().endsWith(".class")){ - String className = entry.getName().replace('/', '.'); - className = className.substring(0, className.length() - ".class".length()); - if(className.startsWith(packageName)){ - Class res = Class.forName(className, false, Thread.currentThread().getContextClassLoader()); - classes.add(res); - //classes.addAll(res.getDeclaredClasses()); //???? - } - } - } - }else{ - File[] files = directory.listFiles(); - for(File file : files){ - if(file.isDirectory()){ - classes.addAll(findClasses(file, packageName + "." + file.getName())); - }else if(file.getName().endsWith(".class")){ - classes.add(Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6), false, Thread.currentThread().getContextClassLoader())); - } - } - } - - return classes; + //TODO doesn't work, a java release broke it, look into alternative solutions (or just don't, Javascript modding is a bad idea anyway) + return new Seq<>(); } }