NIO, better arguments parsing, version specification

.travis.yml

@@ -5,7 +5,7 @@ jdk:
 install: true
 script:
   - mvn clean package
-  - java -jar ./target/protogen-1.0-SNAPSHOT-shaded.jar all
+  - java -jar ./target/protogen-1.0-SNAPSHOT-shaded.jar --type all
 
 cache:
   directories:

pom.xml

@@ -46,6 +46,11 @@
             <artifactId>gson</artifactId>
             <version>2.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.jopt-simple</groupId>
+            <artifactId>jopt-simple</artifactId>
+            <version>5.0.4</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/feathercore/protogen/Bootstrap.java

@@ -16,6 +16,10 @@
 
 package org.feathercore.protogen;
 
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+import joptsimple.util.EnumConverter;
 import org.feathercore.protogen.burger.BurgerReader;
 import org.feathercore.protogen.generate.MaterialGenerator;
 import org.feathercore.protogen.generate.PacketGenerator;
@@ -25,7 +29,8 @@
 import org.feathercore.protogen.wiki.WikiPacketInfo;
 import org.feathercore.protogen.wiki.WikiReader;
 
-import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,71 +39,86 @@
  * @author xtrafrancyz
  */
 public class Bootstrap {
-    private static final File VALID_DIR = new File("gen");
-    private static final File BROKEN_DIR = new File("gen-broken");
+    private static final Path VALID_DIR;
+    private static final Path BROKEN_DIR;
 
-    private static final CachedDataSource<BurgerReader> BURGER = new CachedDataSource<>(BurgerReader::new);
-    private static final CachedDataSource<WikiReader> WIKI = new CachedDataSource<>(WikiReader::new);
+    private static final String DEFAULT_VERSION = "1.13.2";
+    private static final CachedDataSource<BurgerReader> BURGER = new CachedDataSource<>();
+    private static final CachedDataSource<WikiReader> WIKI = new CachedDataSource<>();
 
-    private static final Map<String, GenRunnable> GENERATORS = new HashMap<String, GenRunnable>() {{
-        put("materials", Bootstrap::genMaterials);
-        put("sounds", Bootstrap::genSounds);
-        put("particles", Bootstrap::genParticles);
-        put("packets", Bootstrap::genPackets);
+    private static final Map<GeneratorType, GenRunnable> GENERATORS = new HashMap<GeneratorType, GenRunnable>() {{
+        put(GeneratorType.MATERIALS, Bootstrap::genMaterials);
+        put(GeneratorType.SOUNDS, Bootstrap::genSounds);
+        put(GeneratorType.PARTICLES, Bootstrap::genParticles);
+        put(GeneratorType.PACKETS, Bootstrap::genPackets);
+        put(GeneratorType.ALL, () -> {
+            Bootstrap.genMaterials();
+            Bootstrap.genSounds();
+            Bootstrap.genParticles();
+            Bootstrap.genPackets();
+        });
     }};
 
     public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            System.out.println("Choose what to generate:");
-            System.out.println("    " + String.join(", ", GENERATORS.keySet()));
-            System.out.println("       or");
-            System.out.println("    all");
-            return;
-        }
+        OptionParser parser = new OptionParser();
+        OptionSpec<GeneratorType> specType = parser.accepts("type")
+                                               .withRequiredArg()
+                                               .ofType(GeneratorType.class)
+                                               .withValuesConvertedBy(new EnumConverter<GeneratorType>(GeneratorType.class) {})
+                                               .required();
+        OptionSpec<String> specVersion = parser.accepts("version")
+                                           .withOptionalArg()
+                                           .ofType(String.class)
+                                           .defaultsTo(DEFAULT_VERSION);
+        OptionSet options = parser.parse(args);
+        GeneratorType type = options.valueOf(specType);
+        String version = options.valueOf(specVersion);
+
+        System.out.println("Generator: " + type + ", version: " + version);
 
         FileUtil.deleteRecursive(VALID_DIR);
         FileUtil.deleteRecursive(BROKEN_DIR);
 
-        if (args.length == 1 && args[0].equalsIgnoreCase("all")) {
-            for (GenRunnable gen : GENERATORS.values()) {
-                gen.run();
-            }
-        } else {
-            for (final String arg : args) {
-                GenRunnable gen = GENERATORS.get(arg.toLowerCase());
-                if (gen != null) {
-                    gen.run();
-                }
-            }
-        }
+        BURGER.setHandle(() -> new BurgerReader(version));
+        // TODO workaround please
+        WIKI.setHandle(() -> new WikiReader(DEFAULT_VERSION.equals(version) ?
+                "http://wiki.vg/Protocol" :
+                String.format(WikiReader.URL, version)));
+        GENERATORS.get(type).run();
     }
 
     private static void genMaterials() throws Exception {
         String generated = new MaterialGenerator(BURGER.get()).generate();
-        FileUtil.writeFile(new File(VALID_DIR, MaterialGenerator.CLASS_NAME + ".java"), generated);
+        FileUtil.writeFile(VALID_DIR.resolve(MaterialGenerator.CLASS_NAME + ".java"), generated);
     }
 
     private static void genParticles() throws Exception {
         //String generated = new ParticleGenerator(new WikiReader(new File("proto.html")).getParticles()).generate();
         String generated = new ParticleGenerator(WIKI.get().getParticles()).generate();
-        FileUtil.writeFile(new File(VALID_DIR, ParticleGenerator.CLASS_NAME + ".java"), generated);
+        FileUtil.writeFile(VALID_DIR.resolve(ParticleGenerator.CLASS_NAME + ".java"), generated);
     }
 
     private static void genSounds() throws Exception {
         String generated = new SoundGenerator(BURGER.get().getSounds()).generate();
-        FileUtil.writeFile(new File(VALID_DIR, SoundGenerator.CLASS_NAME + ".java"), generated);
+        FileUtil.writeFile(VALID_DIR.resolve(SoundGenerator.CLASS_NAME + ".java"), generated);
     }
 
     private static void genPackets() throws Exception {
         List<WikiPacketInfo> packets = WIKI.get().getPackets();
         for (WikiPacketInfo info : packets) {
             String generated = new PacketGenerator(info).generate();
-            File protoDir = new File(info.isBroken() ? BROKEN_DIR : VALID_DIR, info.getProtocol().name().toLowerCase());
-            File finalDir = new File(protoDir, info.getSender().name().toLowerCase());
-            FileUtil.writeFile(new File(finalDir, info.getStandardClassName() + ".java"), generated);
+            Path protoDir = (info.isBroken() ? BROKEN_DIR : VALID_DIR).resolve(info.getProtocol().name().toLowerCase());
+            Path finalDir = protoDir.resolve(info.getSender().name().toLowerCase());
+            FileUtil.writeFile(finalDir.resolve(info.getStandardClassName() + ".java"), generated);
         }
     }
 
+    static {
+        Path workingDir = Paths.get(System.getProperty("user.dir"));
+        VALID_DIR = workingDir.resolve("gen");
+        BROKEN_DIR = workingDir.resolve("gen-broken");
+    }
+
     private interface GenRunnable {
         void run() throws Exception;
     }

src/main/java/org/feathercore/protogen/CachedDataSource.java

@@ -23,17 +23,17 @@ public class CachedDataSource<T> {
     private Creator<T> creator;
     private T cache;
 
-    public CachedDataSource(Creator<T> creator) {
-        this.creator = creator;
-    }
-
     public T get() throws Exception {
         if (cache == null) {
             cache = creator.create();
         }
         return cache;
     }
 
+    public void setHandle(Creator<T> creator) {
+        this.creator = creator;
+    }
+
     public interface Creator<T> {
         T create() throws Exception;
     }

src/main/java/org/feathercore/protogen/GeneratorType.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Feather Core
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.feathercore.protogen;
+
+public enum GeneratorType {
+
+    MATERIALS,
+    SOUNDS,
+    PARTICLES,
+    PACKETS,
+    ALL
+}

src/main/java/org/feathercore/protogen/burger/BurgerItem.java

@@ -22,11 +22,14 @@
  * @author xtrafrancyz
  */
 public class BurgerItem {
+    //private static boolean warned;
+
     private String textId;
     private String enumName;
     private int id;
     private int maxStackSize;
-
+    private boolean solid;
+
     public BurgerItem(JsonObject json) {
         this.textId = json.get("text_id").getAsString();
         this.id = json.get("numeric_id").getAsInt();
@@ -49,4 +52,8 @@ public int getId() {
     public int getMaxStackSize() {
         return maxStackSize;
     }
+
+    public boolean isSolid() {
+        return solid;
+    }
 }

src/main/java/org/feathercore/protogen/burger/BurgerReader.java

@@ -22,10 +22,7 @@
 import com.google.gson.JsonParser;
 import org.feathercore.protogen.util.NetworkUtil;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.*;
 
 /**
@@ -34,18 +31,15 @@
  * @author xtrafrancyz
  */
 public class BurgerReader {
-    public static final String STANDARD_URL = "https://pokechu22.github.io/Burger/1.13.2.json";
+
+    public static final String URL = "https://pokechu22.github.io/Burger/%s.json";
 
     private List<BurgerSound> sounds;
     private List<BurgerItem> items;
     private Map<String, BurgerBlock> blocks;
 
-    public BurgerReader() throws IOException {
-        parse(NetworkUtil.get(STANDARD_URL));
-    }
-
-    public BurgerReader(File file) throws IOException {
-        parse(new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8));
+    public BurgerReader(String version) throws IOException {
+        parse(NetworkUtil.get(String.format(URL, version)));
     }
 
     private void parse(String str) {

src/main/java/org/feathercore/protogen/generate/MaterialGenerator.java

@@ -63,6 +63,7 @@ protected void generateClass() {
         sb.append(T1).append("@Getter(AccessLevel.NONE) int id;").append(LF);
         sb.append(T1).append("int maxStackSize;").append(LF);
         sb.append(T1).append("boolean block;").append(LF);
+        sb.append(T2).append("boolean solid;").append(LF);
 
         sb.append(LF);
 
@@ -90,7 +91,8 @@ private void appendMaterials() {
             sb.append(T1).append(item.getEnumName())
               .append("(").append(item.getId()).append(", ")
               .append(item.getMaxStackSize()).append(", ")
-              .append(blocks.containsKey(item.getTextId()))
+              .append(blocks.containsKey(item.getTextId())).append(", ")
+              .append(item.isSolid())
               .append(")");
 
             if (i == this.items.size() - 1) {

src/main/java/org/feathercore/protogen/util/FileUtil.java

@@ -16,31 +16,48 @@
 
 package org.feathercore.protogen.util;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 
 /**
  * @author xtrafrancyz
  */
-@SuppressWarnings({"ConstantConditions", "ResultOfMethodCallIgnored"})
 public class FileUtil {
-    public static void writeFile(File file, String content) {
-        file.getParentFile().mkdirs();
-        try (FileOutputStream fos = new FileOutputStream(file)) {
-            fos.write(content.getBytes(StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            e.printStackTrace();
+    public static void writeFile(Path file, String content) {
+        try {
+            Path parent = file.getParent();
+            if(parent != null && !Files.isDirectory(parent)) {
+                Files.createDirectories(parent);
+            }
+            Files.write(file, content.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE);
+        } catch (IOException ex) {
+            ex.printStackTrace();
         }
     }
 
-    public static void deleteRecursive(File file) {
-        if (file.isDirectory()) {
-            for (File f : file.listFiles()) {
-                deleteRecursive(f);
+    public static void deleteRecursive(Path dir) {
+        if (Files.isDirectory(dir)) {
+            try {
+                Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                        FileVisitResult result = super.postVisitDirectory(dir, exc);
+                        Files.delete(dir);
+                        return result;
+                    }
+
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                        Files.delete(file);
+                        return super.visitFile(file, attrs);
+                    }
+                });
+            } catch (IOException ex) {
+                ex.printStackTrace();
             }
         }
-        file.delete();
     }
 }

src/main/java/org/feathercore/protogen/util/NetworkUtil.java

@@ -21,6 +21,7 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.stream.Collectors;
 
 /**
  * @author xtrafrancyz
@@ -43,22 +44,14 @@ public static String get(String url) throws IOException {
                 }
                 break;
             }
-            StringBuilder response = new StringBuilder();
-            String line;
             if (conn.getResponseCode() / 200 == 1) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-                while ((line = reader.readLine()) != null) {
-                    response.append(line);
+                try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
+                   return br.lines().collect(Collectors.joining());
                 }
             } else {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getErrorStream()));
-                while ((line = reader.readLine()) != null) {
-                    response.append(line);
-                }
                 conn.getInputStream();
                 return null;
             }
-            return response.toString();
         } finally {
             if (conn != null) {
                 conn.disconnect();