Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Argent77
Argent77 committed Sep 14, 2024
2 parents c967641 + 69fee65 commit a1b0688
Show file tree
Hide file tree
Showing 886 changed files with 7,832 additions and 6,893 deletions.
2 changes: 2 additions & 0 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<attribute name="javadoc_location" value="jar:platform:/resource/NearInfinity/lib/flatlaf/flatlaf-intellij-themes-3.4-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/tinylog/tinylog-api-2.7.0.jar" sourcepath="lib/tinylog/tinylog-api-2.7.0-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/tinylog/tinylog-impl-2.7.0.jar" sourcepath="lib/tinylog/tinylog-impl-2.7.0-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
24 changes: 16 additions & 8 deletions .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,28 @@ jobs:
- name: Git checkout
uses: actions/checkout@v4

- name: Set up JDK
- name: Set up JDK (windows)
if: startsWith(matrix.os, 'windows-')
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'

- name: Set up JDK (macos)
if: startsWith(matrix.os, 'macos-')
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'oracle'

- name: Echo JAVA_HOME (windows)
if: (matrix.os == 'windows-latest')
if: startsWith(matrix.os, 'windows-')
run: |
echo $env:JAVA_HOME
java -version
- name: Echo JAVA_HOME (macos)
if: (matrix.os != 'windows-latest')
if: startsWith(matrix.os, 'macos-')
run: |
echo $JAVA_HOME
java -version
Expand All @@ -90,7 +98,7 @@ jobs:

# Building
- name: Build portable archive and installer (windows)
if: (matrix.os == 'windows-latest')
if: startsWith(matrix.os, 'windows-')
run: |
move assets\redistributable\windows\package .
move assets\redistributable\windows\build-image.cmd .
Expand All @@ -108,7 +116,7 @@ jobs:
# Validation
- name: List built files (windows)
if: (matrix.os == 'windows-latest')
if: startsWith(matrix.os, 'windows-')
run: dir

- name: List built files (macos)
Expand All @@ -117,20 +125,20 @@ jobs:

# Uploading
- name: Upload portable artifact (windows)
if: (matrix.os == 'windows-latest')
if: startsWith(matrix.os, 'windows-')
uses: actions/upload-artifact@v4
with:
name: portable-windows
path: NearInfinity-*.zip

- name: Upload exe artifact (windows)
if: (matrix.os == 'windows-latest')
if: startsWith(matrix.os, 'windows-')
uses: actions/upload-artifact@v4
with:
name: installer-windows
path: NearInfinity-*.exe

- name: Upload pkg artifact (macos)
- name: Upload pkg artifact (macos-x86_64)
if: (matrix.os == 'macos-13')
uses: actions/upload-artifact@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ jar/NearInfinity.jar
*.class
/bin
/build
/.idea
/.settings
.vscode/launch.json
152 changes: 152 additions & 0 deletions NearInfinity.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/lib/jorbis/jorbis.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea/rsyntaxtextarea.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/jhexview/jhexview.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/montemedia/montemedia.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/apng-writer/apng-writer-core.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/json/json-20230227.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/commonmark/commonmark-0.21.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-3.4.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-intellij-themes-3.4.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/tinylog/tinylog-api-2.7.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/tinylog/tinylog-impl-2.7.0.jar!/" />
<src_description expected_position="0">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
</src_description>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library name="jorbis.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jorbis/jorbis.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/jorbis/jorbis-0.0.17.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="rsyntaxtextarea.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea/rsyntaxtextarea.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea/rsyntaxtextarea-3.4.0-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="jhexview.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jhexview/jhexview.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://lib/jhexview/jhexview-current.zip" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="montemedia.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/montemedia/montemedia.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/montemedia/MonteMedia-0.7.7.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="apng-writer-core.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/apng-writer/apng-writer-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/apng-writer/apng-writer-core-src.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="json-20230227.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/json/json-20230227.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/json/JSON-java-20230227.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="commonmark-0.21.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commonmark/commonmark-0.21.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/commonmark/commonmark-java-commonmark-parent-0.21.0.zip!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="flatlaf-3.4.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-3.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-3.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-3.4-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="flatlaf-intellij-themes-3.4.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-intellij-themes-3.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-intellij-themes-3.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/flatlaf/flatlaf-intellij-themes-3.4-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="tinylog-api-2.7.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/tinylog/tinylog-api-2.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/tinylog/tinylog-api-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="tinylog-impl-2.7.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/tinylog/tinylog-impl-2.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/tinylog/tinylog-impl-2.7.0-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
</component>
</module>
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ cd NearInfinity
ant
```

The sources also contain configuration files for the [Eclipse IDE](https://www.eclipse.org/).
The sources also contain configuration files for the [Eclipse IDE](https://www.eclipse.org/)
and [IntelliJ IDEA](https://www.jetbrains.com/idea/download/).
It is preferred to use `Apache Ant` for compiling Near Infinity, however.

### Recreate parse tree
Expand Down
31 changes: 24 additions & 7 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<property name="src.path" location="src"/>
<property name="lib.path.rel" value="lib"/>
<property name="lib.path.abs" location="${lib.path.rel}"/>
<property name="tinylog-api.file" value="${lib.path.rel}/tinylog/tinylog-api-2.7.0.jar"/>
<property name="tinylog-impl.file" value="${lib.path.rel}/tinylog/tinylog-impl-2.7.0.jar"/>
<property name="jorbis.file" value="${lib.path.rel}/jorbis/jorbis.jar"/>
<property name="rsyntaxtextarea.file" value="${lib.path.rel}/rsyntaxtextarea/rsyntaxtextarea.jar"/>
<property name="jhexview.file" value="${lib.path.rel}/jhexview/jhexview.jar"/>
Expand All @@ -31,15 +33,28 @@
deprecation="false"
debug="false"
debuglevel="lines,vars,source"
classpath="${classpath}:${jorbis.file}:${rsyntaxtextarea.file}:${jhexview.file}:${montemedia.file}:${apng_writer.file}:${json.file}:${commonmark.file}:${flatlaf.file}:${flatlafthemes.file}">
classpath="${classpath}:${tinylog-api.file}:${tinylog-impl.file}:${jorbis.file}:${rsyntaxtextarea.file}:${jhexview.file}:${montemedia.file}:${apng_writer.file}:${json.file}:${commonmark.file}:${flatlaf.file}:${flatlafthemes.file}">
<!-- Various debugging options: -->
<!-- <compilerarg value="-Xlint:cast"/> -->
<!-- <compilerarg value="-Xlint:deprecation"/> -->
<!-- <compilerarg value="-Xlint:empty"/> -->
<!-- <compilerarg value="-Xlint:finally"/> -->
<!-- <compilerarg value="-Xlint:overrides"/> -->
<!-- <compilerarg value="-Xlint:path"/> -->
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:classfile"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:divzero"/>
<compilerarg value="-Xlint:empty"/>
<!-- <compilerarg value="-Xlint:fallthrough"/> -->
<compilerarg value="-Xlint:finally"/>
<compilerarg value="-Xlint:options"/>
<compilerarg value="-Xlint:overloads"/>
<compilerarg value="-Xlint:overrides"/>
<compilerarg value="-Xlint:path"/>
<compilerarg value="-Xlint:processing"/>
<!-- <compilerarg value="-Xlint:rawtypes"/> -->
<compilerarg value="-Xlint:static"/>
<!-- <compilerarg value="-Xlint:try"/> -->
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:varargs"/>

<!-- Enable all debugging options at once -->
<!-- <compilerarg value="-Xlint:all"/> -->
</javac>

<copy todir="${build.path}">
Expand All @@ -50,6 +65,8 @@
basedir="${build.path}"
includes="**/*"
level="9">
<zipgroupfileset dir="." includes="${tinylog-api.file}"/>
<zipgroupfileset dir="." includes="${tinylog-impl.file}"/>
<zipgroupfileset dir="." includes="${jorbis.file}"/>
<zipgroupfileset dir="." includes="${rsyntaxtextarea.file}"/>
<zipgroupfileset dir="." includes="${jhexview.file}"/>
Expand Down
Loading

0 comments on commit a1b0688

Please sign in to comment.