diff --git a/demo/FeatureDemo/.gitignore b/demo/FeatureDemo/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/demo/FeatureDemo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/demo/FeatureDemo/build.gradle b/demo/FeatureDemo/build.gradle
deleted file mode 100644
index 6fe6c46..0000000
--- a/demo/FeatureDemo/build.gradle
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-
-Omicron cartridge build script
-ver 1.4
-
-Do not change this, they're equals for all games.
-Personalize your omicron.properties instead
-
-*/
-
-apply plugin: 'java'
-apply plugin: "maven-publish"
-
-sourceCompatibility = 1.8
-
-assert file("./omicron.properties").exists()
-
-file("./omicron.properties").withReader {
- Properties props = new Properties()
- props.load(it)
- ext.omicron = props
- println ext.omicron
-}
-
-/*
-assert omicron.entry!=null : "In omicron.properties: entry is mandatory"
-assert omicron.name!=null : "In omicron.properties: name is mandatory"
-assert omicron.description!=null : "In omicron.properties: description is mandatory"
-assert omicron.version!=null : "In omicron.properties: version is mandatory"
-assert omicron.author!=null : "In omicron.properties: author is mandatory"
-assert omicron.year!=null : "In omicron.properties: year is mandatory"
-assert omicron.minPlayers!=null : "In omicron.properties: minPlayers is mandatory"
-assert omicron.maxPlayers!=null : "In omicron.properties: maxPlayers is mandatory"
-assert omicron.mouse!=null : "In omicron.properties: mouse is mandatory"
-assert omicron.keyboard!=null : "In omicron.properties: keyboard is mandatory"
-*/
-
-assert omicron.main ==~ /[A-Za-z][A-Za-z0-9_]*/ : "In omicron.properties: main should be a valid Java identifier"
-assert omicron.pkg ==~ /[A-Za-z][A-Za-z0-9_\.]*/ : "In omicron.properties: pkg should be a valid Java pkg name"
-assert omicron.omicronVersion!=null : "In omicron.properties: omicronVersion is mandatory"
-assert omicron.version!=null : "In omicron.properties: version is mandatory"
-
-version = omicron.version
-
-repositories {
- mavenCentral()
- mavenLocal()
- maven { url 'https://jitpack.io' }
-}
-
-configurations {
- // configuration that holds jars to include in the jar
- extraLibs
-}
-
-dependencies {
- implementation group: 'com.github.msx80', name: 'omicron-api', version: omicron.omicronVersion
- runtimeOnly group: 'com.github.msx80.omicron', name: 'omicron-desktop', version: omicron.omicronVersion
- // runtimeOnly "com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop"
- // to add dependencies from properties
- if(omicron.dep) {
- def deps = omicron.dep.split(";")
- for (d in deps) {
- // println "Extra dependency: "+d
- // compileOnly becouse classes in dependencies will be packed in the cartridge (see jar.from)
- compileOnly d
- extraLibs d
- }
- }
-
-}
-
-jar {
- from('.') {
- include 'omicron.properties'
-
- }
- from {
- // we want to package extra dependencies but NOT the api, since it will
- // already be included as dependency in the pom and present in the runtime
- configurations.extraLibs.collect { it.getName().equals("omicron-api-0.0.1.jar")? null :( it.isDirectory() ? it : zipTree(it)) }
- }
- manifest {
- attributes 'Implementation-Title': omicron.name,
- 'Implementation-Version': omicron.version,
- 'Omicron-Cartridge': 'true'
- }
-/* from {
- println configurations.compileClasspath
- configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
- }*/
- destinationDir = file("$rootDir")
- archiveName omicron.main+'.omicron'
-}
-
- publishing {
- publications {
- maven(MavenPublication) {
- groupId = omicron.pkg
- artifactId = omicron.main
- version = omicron.version
-
- from components.java
- }
- }
- }
-
-task run(type: Exec) {
- dependsOn build
- group = "Execution"
- description = "Run the main class with ExecTask"
- commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(), "com.github.msx80.omicron.DesktopLauncher", omicron.pkg+"."+omicron.main
-}
-
-def styler = 'black red green yellow blue magenta cyan white'
- .split().toList().withIndex(30)
- .collectEntries { key, val -> [(key) : { "\033[${val}m${it}\033[0m" }] }
-
-tasks.publishToMavenLocal.doLast(){
- println ''
- println "${styler['yellow']('Published to maven local as:')} ${styler['cyan'](omicron.pkg+':'+omicron.main+':'+omicron.version)}"
- println ''
- }
-tasks.build.doLast(){
-
-
- println ''
- println "${styler['yellow']('Generated cartridge:')} ${styler['cyan'](omicron.main+'.omicron')}"
- println ''
- }
\ No newline at end of file
diff --git a/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.jar b/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index f3d88b1..0000000
Binary files a/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.properties b/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index ba94df8..0000000
--- a/demo/FeatureDemo/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/demo/FeatureDemo/gradlew b/demo/FeatureDemo/gradlew
deleted file mode 100644
index 2fe81a7..0000000
--- a/demo/FeatureDemo/gradlew
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# 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
-#
-# https://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.
-#
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=`expr $i + 1`
- done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/demo/FeatureDemo/gradlew.bat b/demo/FeatureDemo/gradlew.bat
deleted file mode 100644
index 9618d8d..0000000
--- a/demo/FeatureDemo/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/demo/FeatureDemo/pom.xml b/demo/FeatureDemo/pom.xml
new file mode 100644
index 0000000..00fe0b5
--- /dev/null
+++ b/demo/FeatureDemo/pom.xml
@@ -0,0 +1,87 @@
+
+
+
+4.0.0
+
+feature-demo
+com.github.msx80.omicron
+0.0.3
+
+
+
+
+ jitpack.io
+ https://jitpack.io
+
+
+
+
+
+
+ com.github.msx80
+ omicron-api
+ 0.0.1
+ provided
+
+
+
+com.github.msx80
+ omicron-basics
+ 0.0.2
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+
+ 1.8
+
+
+
+ maven-assembly-plugin
+
+
+
+
+
+
+ jar-with-dependencies
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+ com.coderplus.maven.plugins
+ copy-rename-maven-plugin
+ 1.0
+
+
+ rename-file
+ package
+
+ rename
+
+
+ ${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar
+ ${project.artifactId}.omicron
+
+
+
+
+
+
+
diff --git a/demo/FeatureDemo/omicron.properties b/demo/FeatureDemo/src/main/resources/omicron.properties
similarity index 71%
rename from demo/FeatureDemo/omicron.properties
rename to demo/FeatureDemo/src/main/resources/omicron.properties
index 99ce237..d8552fd 100644
--- a/demo/FeatureDemo/omicron.properties
+++ b/demo/FeatureDemo/src/main/resources/omicron.properties
@@ -3,4 +3,3 @@ name=Features Demo
pkg=omicron.demo.featuresdemo
main=FeaturesDemo
version=0.0.1
-dep=com.github.msx80:omicron-basics:0.0.2
\ No newline at end of file
diff --git a/omicron-player/omicron-player-desktop/pom.xml b/omicron-player/omicron-player-desktop/pom.xml
index 8bb9b3a..2a8af44 100644
--- a/omicron-player/omicron-player-desktop/pom.xml
+++ b/omicron-player/omicron-player-desktop/pom.xml
@@ -55,21 +55,7 @@
1.8
-
-
+
diff --git a/omicron-player/omicron-player/pom.xml b/omicron-player/omicron-player/pom.xml
index 34d99d6..30689ea 100644
--- a/omicron-player/omicron-player/pom.xml
+++ b/omicron-player/omicron-player/pom.xml
@@ -16,7 +16,13 @@
-
+
com.github.msx80omicron-api
diff --git a/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/EditorWidget.java b/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/EditorWidget.java
index 1e4738a..f8fc6ef 100644
--- a/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/EditorWidget.java
+++ b/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/EditorWidget.java
@@ -1,22 +1,22 @@
package com.github.msx80.omicron.fantasyconsole;
-import java.util.EnumSet;
-
-import com.github.msx80.omicron.api.Controller;
-import com.github.msx80.omicron.api.Sys;
-import com.github.msx80.omicron.basicutils.Colors;
import com.github.msx80.omicron.basicutils.gui.BaseWidget;
-import com.github.msx80.omicron.basicutils.gui.Controllable;
-import com.github.msx80.omicron.basicutils.text.TextDrawerFixed;
-import ate.Cursor;
-import ate.Editor;
-import ate.Modifiers;
-import ate.SpecialKeys;
+public class EditorWidget extends BaseWidget /*implements Controllable*/ {
-public class EditorWidget extends BaseWidget implements Controllable {
+ public EditorWidget(int w, int h) {
+ super(w, h);
+
+ }
+ @Override
+ public void draw() {
+
+ }
+
+
+/*
private Editor tb = new Editor();
private TextDrawerFixed td;
private Sys sys;
@@ -150,5 +150,5 @@ public void draw() {
y+=8;
}
}
-
+*/
}
diff --git a/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/OmicronPlayer.java b/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/OmicronPlayer.java
index a1789b2..dcc7a08 100644
--- a/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/OmicronPlayer.java
+++ b/omicron-player/omicron-player/src/main/java/com/github/msx80/omicron/fantasyconsole/OmicronPlayer.java
@@ -137,6 +137,7 @@ private void selectIntro(int idx, String name)
}
}
private void activateEditorWidget(Sys sys2, TextDrawerFixed font3) {
+ /*
wm = new WidgetManager(sys);
EditorWidget ew = new EditorWidget(sys2, font3, 300, 500);
// l = new ListWithSelection<>(fileList.files, font2, 0, 0, 100);
@@ -147,7 +148,7 @@ private void activateEditorWidget(Sys sys2, TextDrawerFixed font3) {
ScrollbarDrawer sh = new StandardScrollbarDrawer(3, Tic80.RED, Tic80.DARK_RED);
s = new Scroller(sys, 200+sv.getThickness(), 100, ew, sv, sh);
wm.add(s, 40, 30);
-
+ */
}