diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 4e2cbc7..b2c3eed 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -4,6 +4,6 @@ clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar2.sh:7977fc138ee5db798d08c34734f0be93 - jar.sh:821d5a109324d405f05c35c4bb129375 - -release.sh:b2338320cf2fc250572b4e4d5a887807 - +release.sh:027178aa6da76180401a188d8f03af64 - update.sh:3be721658983183efa395984acd96b03 - zip.sh:273f5a83b80a8e54022d60514dfeec0a - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh index 7450d55..fca8c4b 100755 --- a/Java/scripts/release.sh +++ b/Java/scripts/release.sh @@ -1,6 +1,7 @@ #Use ./sig release to create a custom installer based on OS. #Java source ${LANGUAGE}/scripts/version_info +FILES=$(cat ${LANGUAGE}/scripts/.package.files) if [ "$1" = "windows" ];then echo "Creating a package for Windows..." echo "Not implemented yet." @@ -10,10 +11,15 @@ elif [ "$1" = "mac" ];then elif [ "$1" = "linux" ];then echo "Creating a package for Linux..." cd .. - jpackage --input RabiClone --main-jar bin/RabiClone.jar --main-class sig.RabiClone --type app-image --dest RabiCloneOut - cp -R RabiCloneOut/RabiClone/lib/app/* RabiCloneOut/RabiClone - jpackage --app-image RabiCloneOut/RabiClone --name RabiClone - rm -Rf RabiCloneOut + mkdir -vp RabiCloneOut/in + for f in $FILES + do + cp -Rv --parents $PROJECT_NAME/$f RabiCloneOut/in + done + jpackage --verbose --input RabiCloneOut/in/RabiClone --main-jar bin/RabiClone.jar --main-class sig.RabiClone --type app-image --dest RabiCloneOut + cp -Rv RabiCloneOut/RabiClone/lib/app/* RabiCloneOut/RabiClone + jpackage --verbose --app-image RabiCloneOut/RabiClone --name RabiClone + rm -Rfv RabiCloneOut cd RabiClone echo "Done!" else diff --git a/src/sig/objects/ConfigureControls.java b/src/sig/objects/ConfigureControls.java index 6f5f80b..3847af6 100644 --- a/src/sig/objects/ConfigureControls.java +++ b/src/sig/objects/ConfigureControls.java @@ -18,6 +18,7 @@ import sig.engine.Panel; import sig.engine.String; import sig.engine.Transform; import sig.engine.objects.Object; +import sig.map.Map; public class ConfigureControls extends Object{ @@ -144,6 +145,25 @@ public class ConfigureControls extends Object{ return sb; } + + + @Override + public void KeyPressed(Action a) { + switch(a) { + case PLAY_GAME:{ + RabiClone.OBJ.remove(RabiClone.level_renderer); + RabiClone.OBJ.add(RabiClone.level_renderer = new LevelRenderer(RabiClone.p)); + RabiClone.StartGame(); + }break; + case LEVEL_EDITOR:{ + RabiClone.OBJ.clear(); + RabiClone.ResetGame(); + Map.LoadMap(RabiClone.CURRENT_MAP); + RabiClone.OBJ.add(RabiClone.level_renderer = new EditorRenderer(RabiClone.p)); + }break; + } + } + public void rawKeyPressed(int keyCode) { if (assigningKey) { List clist = KeyBind.KEYBINDS.get(selectedAction);