diff --git a/README.md b/README.md index 7feddd4..93f78dd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Files 271](https://img.shields.io/badge/Files-271-inactive)](https://github.com/yoyosource/YAPI) [![Methods 1499](https://img.shields.io/badge/Methods-1499-inactive)](https://github.com/yoyosource/YAPI) -[![Code Lines 28826](https://img.shields.io/badge/Code%20Lines-28826-inactive)](https://github.com/yoyosource/YAPI) +[![Code Lines 28838](https://img.shields.io/badge/Code%20Lines-28838-inactive)](https://github.com/yoyosource/YAPI) [![Java Version V12.0.1](https://img.shields.io/badge/Java%20Version-12.0.1-blue.svg)](https://github.com/yoyosource/YAPI/releases/tag/v1.0) [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202-blue)](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/build.gradle b/build.gradle index e35f02f..2892e73 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ publishing { maven(MavenPublication) { groupId = 'yoyosource' artifactId = 'YAPI' - version = '1.2-3.3' + version = '1.2-3.4' from components.java } diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar new file mode 100644 index 0000000..9205815 Binary files /dev/null and b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar differ diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.md5 b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.md5 new file mode 100644 index 0000000..f4fde26 --- /dev/null +++ b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.md5 @@ -0,0 +1 @@ +7c122af05a5f34abc7e69d15c5eb68fb \ No newline at end of file diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.sha1 b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.sha1 new file mode 100644 index 0000000..bcff5ba --- /dev/null +++ b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.jar.sha1 @@ -0,0 +1 @@ +e3ce7c6d1ae5c7a13073ebe425a23ffd87e46304 \ No newline at end of file diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom new file mode 100644 index 0000000..943a7e1 --- /dev/null +++ b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom @@ -0,0 +1,22 @@ + + + 4.0.0 + yoyosource + YAPI + 1.2-3.4 + + + ch.obermuhlner + big-math + 2.3.0 + compile + + + org.fusesource.jansi + jansi + 1.18 + compile + + + diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.md5 b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.md5 new file mode 100644 index 0000000..7e7accc --- /dev/null +++ b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.md5 @@ -0,0 +1 @@ +58f96759fdecd0415aacd5f1dc83163f \ No newline at end of file diff --git a/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.sha1 b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.sha1 new file mode 100644 index 0000000..7667ddd --- /dev/null +++ b/releases/yoyosource/YAPI/1.2-3.4/YAPI-1.2-3.4.pom.sha1 @@ -0,0 +1 @@ +5b2febef6a0ec85007fce1323e1635f3481baea6 \ No newline at end of file diff --git a/releases/yoyosource/YAPI/maven-metadata.xml b/releases/yoyosource/YAPI/maven-metadata.xml index 6dbe006..e505f61 100644 --- a/releases/yoyosource/YAPI/maven-metadata.xml +++ b/releases/yoyosource/YAPI/maven-metadata.xml @@ -3,7 +3,7 @@ yoyosource YAPI - 1.2-3.3 + 1.2-3.4 1.2 1.2-1 @@ -12,7 +12,8 @@ 1.2-3.1 1.2-3.2 1.2-3.3 + 1.2-3.4 - 20200412193351 + 20200415214917 diff --git a/releases/yoyosource/YAPI/maven-metadata.xml.md5 b/releases/yoyosource/YAPI/maven-metadata.xml.md5 index 8645707..3b602cf 100644 --- a/releases/yoyosource/YAPI/maven-metadata.xml.md5 +++ b/releases/yoyosource/YAPI/maven-metadata.xml.md5 @@ -1 +1 @@ -b05226fba2e43210cc724bcad33d0806 \ No newline at end of file +24f9b9fdfa59470e6972d03e228afce1 \ No newline at end of file diff --git a/releases/yoyosource/YAPI/maven-metadata.xml.sha1 b/releases/yoyosource/YAPI/maven-metadata.xml.sha1 index 6d1069e..c4b09b7 100644 --- a/releases/yoyosource/YAPI/maven-metadata.xml.sha1 +++ b/releases/yoyosource/YAPI/maven-metadata.xml.sha1 @@ -1 +1 @@ -b48b0ab968f9371490d85d0001e555271c5aca92 \ No newline at end of file +ce1938c2bb8488adc5512cdb1dd988618f41d9d7 \ No newline at end of file diff --git a/src/main/java/main/InteractiveMain.java b/src/main/java/main/InteractiveMain.java index fc8439a..822288b 100644 --- a/src/main/java/main/InteractiveMain.java +++ b/src/main/java/main/InteractiveMain.java @@ -13,14 +13,14 @@ package main; -import yapi.encryption.proveofwork.ProveOfWork; +import yapi.file.FileUtils; import yapi.manager.yapion.YAPIONParser; import yapi.manager.yapion.value.YAPIONObject; -import yapi.file.FileUtils; import yapi.string.StringSplitting; import yapi.ui.console.Console; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; public class InteractiveMain { @@ -49,8 +49,8 @@ private static void send(StringBuilder s) { public static void main(String[] args) { if (true) { - //Console.main(args); - ProveOfWork.main(args); + Console.main(args); + //ProveOfWork.main(args); return; } diff --git a/src/main/java/yapi/YAPIUtils.java b/src/main/java/yapi/YAPIUtils.java new file mode 100644 index 0000000..8a6ce0d --- /dev/null +++ b/src/main/java/yapi/YAPIUtils.java @@ -0,0 +1,56 @@ +package yapi; + +import yapi.ui.console.Console; +import yapi.ui.console.ConsoleMessageBuilder; + +public class YAPIUtils { + + public static String link() { + return "https://github.com/yoyosource/YAPI"; + } + + public static String link_Refined() { + return "https://github.com/yoyosource/YAPI"; + } + + public static void link_Send() { + new Console().send(ConsoleMessageBuilder.build(link_Refined())); + } + + public static String licence() { + return ""; + } + + public static String license_Refined() { + return ""; + } + + public static String license_OneLine() { + return ""; + } + + public static String license_OneLine_Refined() { + return ""; + } + + public static void license_Send() { + new Console().send(ConsoleMessageBuilder.build(license_Refined())); + } + + public static String logo() { + return ""; + } + + public static String logo_Refined() { + return ""; + } + + public static void logo_Send() { + new Console().send(ConsoleMessageBuilder.build(logo_Refined())); + } + + public static void logo_license_Send() { + new Console().send(ConsoleMessageBuilder.build(logo_Refined() + "\n\n" + license_OneLine_Refined())); + } + +} diff --git a/src/main/java/yapi/ui/console/Console.java b/src/main/java/yapi/ui/console/Console.java index 161a7a0..6730709 100644 --- a/src/main/java/yapi/ui/console/Console.java +++ b/src/main/java/yapi/ui/console/Console.java @@ -16,7 +16,10 @@ public class Console { public static void main(String[] args) { Console console = new Console(); - console.send(ConsoleMessageBuilder.build("Hello World")); + console.send(ConsoleMessageBuilder.build("\\\\\\\\ \\\\¸/ /¯\\\\ |¯) ˙|˙ //")); + console.send(ConsoleMessageBuilder.build("// | |¯| |¯ ¸|¸ \\\\\\\\")); + console.send(ConsoleMessageBuilder.build("")); + console.send(ConsoleMessageBuilder.build("(C) 2019,2020 yoyosource Apache-2.0")); } private ConsoleAlignment alignment = ConsoleAlignment.LEFT; diff --git a/src/main/java/yapi/ui/console/ConsoleBuildAttribute.java b/src/main/java/yapi/ui/console/ConsoleBuildAttribute.java index f8800ec..7cc89b2 100644 --- a/src/main/java/yapi/ui/console/ConsoleBuildAttribute.java +++ b/src/main/java/yapi/ui/console/ConsoleBuildAttribute.java @@ -64,8 +64,8 @@ enum ConsoleBuildAttribute { ALIGNMENT_CENTER("center", new TaskAlignment(ConsoleAlignment.CENTER), new TaskAlignment(ConsoleAlignment.LEFT)), ALIGNMENT_RIGHT("right", new TaskAlignment(ConsoleAlignment.RIGHT), new TaskAlignment(ConsoleAlignment.LEFT)), - ATTRIBUTE_INTENSITY_BOLD("intensity:bold", new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD), new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD_OFF)), - ATTRIBUTE_INTENSITY_FAINT("intensity:faint", new TaskAttribute(Ansi.Attribute.INTENSITY_FAINT), new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD_OFF)), + ATTRIBUTE_INTENSITY_BOLD("bold", new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD), new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD_OFF)), + ATTRIBUTE_INTENSITY_FAINT("faint", new TaskAttribute(Ansi.Attribute.INTENSITY_FAINT), new TaskAttribute(Ansi.Attribute.INTENSITY_BOLD_OFF)), ATTRIBUTE_ITALIC("italic", new TaskAttribute(Ansi.Attribute.ITALIC), new TaskAttribute(Ansi.Attribute.ITALIC_OFF)), ATTRIBUTE_UNDERLINE("underline", new TaskAttribute(Ansi.Attribute.UNDERLINE), new TaskAttribute(Ansi.Attribute.UNDERLINE_OFF)), ATTRIBUTE_UNDERLINE_DOUBLE("underline:double", new TaskAttribute(Ansi.Attribute.UNDERLINE_DOUBLE), new TaskAttribute(Ansi.Attribute.UNDERLINE_OFF)), diff --git a/src/main/java/yapi/ui/console/ConsoleMessageBuilder.java b/src/main/java/yapi/ui/console/ConsoleMessageBuilder.java index c09f2d9..eb8c934 100644 --- a/src/main/java/yapi/ui/console/ConsoleMessageBuilder.java +++ b/src/main/java/yapi/ui/console/ConsoleMessageBuilder.java @@ -147,6 +147,10 @@ public static ConsoleMessage build(String s) { st.append(c); String attribute = st.toString(); st = new StringBuilder(); + if (attribute.length() == 1) { + tasks.add(new TaskText(attribute)); + continue; + } tasks.addAll(buildAttributes(attribute)); } else { if (c == '\n') { diff --git a/src/main/java/yapi/ui/yui/YUI.java b/src/main/java/yapi/ui/yui/YUI.java new file mode 100644 index 0000000..8131236 --- /dev/null +++ b/src/main/java/yapi/ui/yui/YUI.java @@ -0,0 +1,20 @@ +package yapi.ui.yui; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class YUI { + + public static void main(String[] args) { + YUI yui = new YUI(new File("/Users/jojo/IdeaProjects/YAPI/src/main/resources/Test.yui")); + System.out.println(yui.configs); + } + + private List configs = new ArrayList<>(); + + public YUI(File config) { + configs.add(new YUIConfig(config)); + } + +} diff --git a/src/main/java/yapi/ui/yui/YUIConfig.java b/src/main/java/yapi/ui/yui/YUIConfig.java new file mode 100644 index 0000000..8264691 --- /dev/null +++ b/src/main/java/yapi/ui/yui/YUIConfig.java @@ -0,0 +1,32 @@ +package yapi.ui.yui; + +import yapi.file.FileUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class YUIConfig { + + private String name; + private List lines = new ArrayList<>(); + + YUIConfig(File config) { + name = config.getName(); + String[] strings = FileUtils.fileContentAsString(config); + for (String s : strings) { + String t = s.trim(); + if (!t.isEmpty()) { + lines.add(t); + } + } + } + + @Override + public String toString() { + return "YUIConfig{" + + "name='" + name + "'" + + ", lines=" + lines + + '}'; + } +}