OCLIDE: Release Candidate 1

.gitignore

@@ -11,7 +11,7 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
+#*.jar
 *.war
 *.nar
 *.ear
@@ -30,6 +30,7 @@ hs_err_pid*
 /workspace/
 /temp/
 /Ocelot-0.6.5-lua52-native.64.dll
-/projects/LuaScript1null
+/projects/
 /Ocelot-0.6.5-lua53-native.64.dll
-/dist/
+/dist/
+/.machine/

README.md

@@ -1,31 +1,27 @@
 # OCLIDE
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/d0ace57bc0a349529c699733b8dc3e9e)](https://www.codacy.com/gh/Vladg24YT/Oclide/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Vladg24YT/Oclide&amp;utm_campaign=Badge_Grade)<br>
+
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/d0ace57bc0a349529c699733b8dc3e9e)](https://www.codacy.com/gh/Vladg24YT/Oclide/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Vladg24YT/Oclide&amp;utm_campaign=Badge_Grade)  
+[![Java CI](https://github.com/Vladg24YT/OCLIDE/actions/workflows/ant.yml/badge.svg?branch=oclide-rc1)](https://github.com/Vladg24YT/OCLIDE/actions/workflows/ant.yml)  
 
 ![Program screenshot](https://raw.githubusercontent.com/Vladg24YT/Oclide/gh-pages/images/screenshots/OCLIDE_screenshot.png) 
 Oclide is an INDEV IDE for OpenComputers 1.7.5 written in Java 8
 
 ## Feature list
 - [x] Editing tools (Undo/Redo, Clipboard)
-- [x] Refactoring tools
+- [ ] Refactoring tools
 - [x] Syntax highlighting
 - [x] OCEmu integration
-- [ ] Internationalization
-- [ ] Code autocompletion
-- [ ] Modularity
-- [ ] OCEmu debugging tools
-- [ ] Built-in [Ocelot Brain](https://gitlab.com/cc-ru/ocelot/ocelot-brain)-based emulator
-- [ ] Minecraft 1.7.10 - 1.12.2 integration
 - [x] Code autocompletion *(ongoing)*
 - [ ] Code autoformatting
 - [ ] Variable navigator
 - [ ] Static code analyzer
-- [x] Minecraft 1.7.10 - 1.12.2 integration *(ongoing)*
+- [ ] Minecraft 1.7.10 - 1.12.2 integration *(ongoing)*
 - [x] [OCEmu](https://github.com/zenith391/OCEmu) integration
 - [x] [Ocelot Desktop](https://gitlab.com/cc-ru/ocelot/ocelot-desktop/) integration *(done, but blocked in UI)*
 - [ ] [CODE](https://github.com/Avevad/code) integration
 - [ ] [AurumEmulator](https://github.com/Zabqer/AurumEmulator) integration
-- [x] Built-in [Ocelot Brain](https://gitlab.com/cc-ru/ocelot/ocelot-brain)-based emulator *(ongoing)*
-- [x] [OCVM](https://github.com/payonel/ocvm) support *(ongoing)*
+- [ ] Built-in [Ocelot Brain](https://gitlab.com/cc-ru/ocelot/ocelot-brain)-based emulator *(ongoing)*
+- [ ] [OCVM](https://github.com/payonel/ocvm) support *(ongoing)*
 - [ ] [OpenComputersVM](https://github.com/FrostyPenguin/OpenComputersVM) support
 - [x] Internationalization *(ongoing)*
 - [ ] <s>Modularity</s>
@@ -113,3 +109,6 @@ Oclide is an INDEV IDE for OpenComputers 1.7.5 written in Java 8
 2. Extract `.rar`/Copy `.jar` and `lib` to any folder you want. It will be OCLIDE's working directory.
 3. Run the `OCLIDE.jar` file
 
+## Contributing
+Feel free to create push requests with translation files (`io.VladTheMountain.oclide.resources` and `io.VladTheMountain.emulator.resources` packages).  
+The project is also open to issues about bugs, incorrectly working things or feature requests.

build.xml

@@ -57,4 +57,29 @@
     properties which you can use, check the target you are overriding in the	
     nbproject/build-impl.xml file. 	
     -->	
+
+    <property name="lib.dir" value="./lib"/>
+
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+
+    <property name="myclasspath" refid="classpath"/>
+    <target name="-pre-compile">
+        <echo message="Classpath = ${myclasspath}"/>
+
+        <echo message="Classes = ${classes.dir}"/>
+        <echo message="Src = ${src.dir}"/>
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+    </target>
+
+    <target name="-post-jar">
+        <java fork="true" classname="${main-class}">
+            <classpath>
+                <path refid="classpath"/>
+                <path location="${jar.dir}/${ant.project.name}.jar"/>
+            </classpath>
+        </java>
+    </target>
 </project>

nbproject/build-impl.xml

@@ -71,8 +71,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
+        <property name="default.javac.source" value="1.8"/>
+        <property name="default.javac.target" value="1.8"/>
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
@@ -205,7 +205,7 @@ is divided into following sections:
         </condition>
         <condition property="have.tests">
             <or>
-                <available file="${test.src.dir}"/>
+                <available file="${test.test.dir}"/>
             </or>
         </condition>
         <condition property="have.sources">
@@ -314,7 +314,7 @@ is divided into following sections:
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="test.test.dir">Must set test.test.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -613,7 +613,7 @@ is divided into following sections:
                 <j2seproject3:junit-prototype>
                     <customizePrototype>
                         <batchtest todir="${build.test.results.dir}">
-                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <fileset dir="${test.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                                 <filename name="@{testincludes}"/>
                             </fileset>
                             <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
@@ -639,7 +639,7 @@ is divided into following sections:
                     <isset property="test.method"/>
                 </condition>
                 <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                    <fileset dir="${test.test.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
                 </union>
@@ -1569,14 +1569,14 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
-        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
-        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
+        <j2seproject3:modulename property="test.module.name" sourcepath="${test.test.dir}"/>
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.test.dir}">
             <and>
                 <isset property="test.module.name"/>
                 <length length="0" string="${test.module.name}" when="greater"/>
             </and>
         </condition>
-        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+        <condition else="--patch-module ${module.name}=${test.test.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
             <and>
                 <isset property="test.module.name"/>
                 <length length="0" string="${test.module.name}" when="greater"/>
@@ -1617,16 +1617,16 @@ is divided into following sections:
     </target>
     <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.test.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.test.dir}">
             <customize>
                 <compilerarg line="${javac.test.compilerargs}"/>
             </customize>
         </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -1641,13 +1641,13 @@ is divided into following sections:
     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.test.dir}" srcdir="${test.test.dir}">
             <customize>
                 <compilerarg line="${javac.test.compilerargs}"/>
             </customize>
         </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">
@@ -1711,6 +1711,7 @@ is divided into following sections:
     </target>
     <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="debug-test-method" name="debug-single-method"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>

nbproject/genfiles.properties

@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=5dc6d4d3
-nbproject/build-impl.xml.script.CRC32=d20c0ad3
-nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48
+nbproject/build-impl.xml.data.CRC32=22e507ae
+nbproject/build-impl.xml.script.CRC32=e2a7c905
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48

nbproject/project.properties

@@ -38,6 +38,8 @@ dist.jlink.output=${dist.jlink.dir}/OCLIDE
 endorsed.classpath=
 excludes=
 file.reference.autocomplete-3.1.1.jar=lib/autocomplete-3.1.1.jar
+file.reference.commons-collections4-4.4.jar=lib/commons-collections4-4.4.jar
+file.reference.nbt-1.5.1.jar=lib/nbt-1.5.1.jar
 file.reference.ocelot-brain-0.6.5.jar=lib/ocelot-brain-0.6.5.jar
 file.reference.Oclide-src=src
 file.reference.rstaui-3.1.1.jar=lib/rstaui-3.1.1.jar
@@ -52,7 +54,9 @@ javac.classpath=\
     ${file.reference.rstaui-3.1.1.jar}:\
     ${file.reference.rsyntaxtextarea-3.1.2.jar}:\
     ${file.reference.spellchecker-3.1.1.jar}:\
-    ${file.reference.ocelot-brain-0.6.5.jar}
+    ${file.reference.ocelot-brain-0.6.5.jar}:\
+    ${file.reference.commons-collections4-4.4.jar}:\
+    ${file.reference.nbt-1.5.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -79,6 +83,8 @@ javadoc.nonavbar=false
 javadoc.notree=false
 javadoc.private=true
 javadoc.reference.autocomplete-3.1.1.jar=lib/autocomplete-3.1.1-javadoc.jar
+javadoc.reference.commons-collections4-4.4.jar=lib/commons-collections4-4.4-javadoc.jar
+javadoc.reference.nbt-1.5.1.jar=lib/nbt-1.5.1-javadoc.jar
 javadoc.reference.rstaui-3.1.1.jar=lib/rstaui-3.1.1-javadoc.jar
 javadoc.reference.rsyntaxtextarea-3.1.2.jar=lib/rsyntaxtextarea-3.1.2-javadoc.jar
 javadoc.reference.spellchecker-3.1.1.jar=lib/spellchecker-3.1.1-javadoc.jar
@@ -131,7 +137,10 @@ run.test.modulepath=\
     ${javac.test.modulepath}
 source.encoding=UTF-8
 source.reference.autocomplete-3.1.1.jar=lib/autocomplete-3.1.1-sources.jar
+source.reference.commons-collections4-4.4.jar=lib/commons-collections4-4.4-sources.jar
+source.reference.nbt-1.5.1.jar=lib/nbt-1.5.1-sources.jar
 source.reference.rstaui-3.1.1.jar=lib/rstaui-3.1.1-sources.jar
 source.reference.rsyntaxtextarea-3.1.2.jar=lib/rsyntaxtextarea-3.1.2-sources.jar
 source.reference.spellchecker-3.1.1.jar=lib/spellchecker-3.1.1-sources.jar
 src.dir=${file.reference.Oclide-src}
+test.test.dir=test

nbproject/project.xml

@@ -8,7 +8,7 @@
                 <root id="src.dir"/>
             </source-roots>
             <test-roots>
-                <root id="test.src.dir"/>
+                <root id="test.test.dir"/>
             </test-roots>
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">