版本推进

整理代码

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.github/.gitattributes

@@ -0,0 +1,2 @@
+actions/**/*.yml text eol=lf
+workflows/*.yml text eol=lf

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_1.md

@@ -1,9 +1,8 @@
 ---
 name: Bug report (bluescreen crash) Bug报告 (蓝屏报错)
-about: Create a report of problems which made the crash with a bluescreen
+about: Create a bug report which causes a bluescreen crash
 ---
-Screenshot with crash information: (delete this line before submitting)
-*Image Here*
+Screenshot with crash information (*Image(s) Here*):
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button: (delete this line before submitting)
-*Details Here*
+
+If you can reproduce it, write the steps here. If you can't, try to describe what causes the game to crash, like pressing a key/button (*Details Here*)

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_2.md

@@ -1,9 +1,8 @@
 ---
 name: Bug report (unintended behaviors) Bug报告 (奇怪的现象)
-about: Create a report of unintended behaviors
+about: Create bug report that causes unintended behaviors
 ---
-Screenshot with unintended behaviors: (delete this line before submitting)
-*Image(s) Here*
+Screenshot with unintended behaviors (*Image(s) Here*):
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button: (delete this line before submitting)
-*Details Here*
+
+If you can reproduce it, write the steps here. If you can't, try to describe what causes the unintended behavior, like pressing a key/button (*Details Here*):

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_3.md

@@ -2,3 +2,7 @@
 name: Feature Request 添加新功能
 about: Suggest an idea that may improve Techmino 提一些有意思的新想法,让Techmino越来越好!
 ---
+### What feature do you want to suggest to the game?
+
+
+

.github/actions/build-android/action.yml

@@ -1,72 +0,0 @@
-name: 'build Android'
-description: 'build Android package'
-inputs:
-  type:
-    required: true
-  code:
-    required: true
-  name:
-    required: true
-  file-path:
-    required: true
-  SIGNING_KEY:
-    required: true
-  KEY_STORE_PASSWORD:
-    required: true
-  ALIAS:
-    required: true
-  KEY_PASSWORD:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '8'
-    - name: Clone love-android
-      shell: bash
-      run: |
-        git clone --recurse-submodules https://github.com/26F-Studio/love-android -b CI --depth 1 --shallow-submodules
-    - uses: ./.github/actions/build-love
-      with:
-        file-path: love-android/app/src/main/assets/game.love
-    - name: Download ColdClear arm64-v8a
-      uses: ./.github/actions/get-cc
-      with:
-        arch: android_aarch64
-        dir: ColdClear/arm64-v8a
-    - name: Process ColdClear arm64-v8a
-      shell: bash
-      run: |
-        mkdir -p love-android/app/libs/arm64-v8a
-        mv ColdClear/arm64-v8a/love-11.3-android/lib/arm64-v8a/libcold_clear.so love-android/app/libs/arm64-v8a
-        mkdir -p libAndroid/arm64-v8a
-        mv ColdClear/arm64-v8a/libs/arm64-v8a/libCCloader.so libAndroid/arm64-v8a
-    - name: Download ColdClear armeabi-v7a
-      uses: ./.github/actions/get-cc
-      with:
-        arch: android_armv7
-        dir: ColdClear/armeabi-v7a
-    - name: Process ColdClear armeabi-v7a
-      shell: bash
-      run: |
-        mkdir -p love-android/app/libs/armeabi-v7a
-        mv ColdClear/armeabi-v7a/love-11.3-android/lib/armeabi-v7a/libcold_clear.so love-android/app/libs/armeabi-v7a
-        mkdir -p libAndroid/armeabi-v7a
-        mv ColdClear/armeabi-v7a/libs/armeabi-v7a/libCCloader.so libAndroid/armeabi-v7a
-    - name: Pack ColdClear
-      shell: bash
-      run: |
-        7z a -tzip love-android/app/src/main/assets/game.love libAndroid
-    - name: Build Techmino
-      shell: bash
-      run: |
-        echo "${{ inputs.SIGNING_KEY }}" | base64 -d > love-android/app/android.keystore
-        python3 .github/workflows/updateVersion.py -T Android${{ inputs.type }} -C ${{ inputs.code }} -N ${{ inputs.name }} -S ${{ inputs.KEY_STORE_PASSWORD }} -A ${{ inputs.ALIAS }} -K ${{ inputs.KEY_PASSWORD }}
-        chmod 777 love-android/gradlew
-        cd love-android/
-        ./gradlew assembleRelease
-    - name: rename apk
-      shell: bash
-      run: mv love-android/app/build/outputs/apk/release/app-release.apk ${{ inputs.file-path }}

.github/actions/build-linux/action.yml

@@ -1,40 +0,0 @@
-name: 'build Linux'
-description: 'build Linux package'
-inputs:
-  file-path:
-    required: false
-    default: Techmino.AppImage
-  icon:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - name: Download AppImageKit
-      shell: bash
-      run: |
-        curl -OL https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
-    - name: Download love
-      shell: bash
-      run: |
-        curl -OL https://github.com/love2d/love/releases/download/11.3/love-11.3-x86_64.AppImage
-        chmod 777 love-11.3-x86_64.AppImage
-        ./love-11.3-x86_64.AppImage --appimage-extract
-    - name: Download ColdClear
-      uses: ./.github/actions/get-cc
-      with:
-        arch: linux
-    - name: Pack Techmino
-      shell: bash
-      run: |
-        rm -rf squashfs-root/love squashfs-root/love.desktop squashfs-root/love.svg squashfs-root/.DirIcon
-        mv .github/build/Linux/love.template squashfs-root/love
-        mv .github/build/Linux/Techmino.desktop.template squashfs-root/Techmino.desktop
-        mv ${{ inputs.icon }} squashfs-root/icon.png
-        cp squashfs-root/icon.png squashfs-root/.DirIcon
-        chmod 777 squashfs-root/love
-        mkdir -p squashfs-root/usr/share/Techmino
-        mv document media parts Zframework conf.lua main.lua version.lua squashfs-root/usr/share/Techmino
-        mv CCloader.so squashfs-root/usr/share/Techmino
-        mv libcold_clear.so squashfs-root/usr/lib
-        chmod 777 appimagetool-x86_64.AppImage
-        ./appimagetool-x86_64.AppImage squashfs-root ${{ inputs.file-path }}

.github/actions/build-love/action.yml

@@ -1,11 +0,0 @@
-name: 'build love'
-description: 'build love file'
-inputs:
-  file-path:
-    required: true
-    default: Techmino.love
-runs:
-  using: "composite"
-  steps:
-    - run: 7z a -tzip ${{ inputs.file-path }} document media parts Zframework conf.lua main.lua version.lua
-      shell: bash

.github/actions/build-macos/action.yml

@@ -1,45 +0,0 @@
-name: 'build Mac OS'
-description: 'build Mac OS package'
-inputs:
-  name:
-    required: true
-  icon:
-    required: true
-  MACOS_CERTIFICATE:
-    required: true
-  MACOS_CERTIFICATE_ID:
-    required: true
-  MACOS_CERTIFICATE_PWD:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - uses: ./.github/actions/build-love
-    - name: Download template
-      uses: ./.github/actions/get-unzip
-      with:
-        url: https://github.com/26F-Studio/Techmino/releases/download/v0.15.1/Techmino.app.zip
-    - name: Download ColdClear
-      uses: ./.github/actions/get-cc
-      with:
-        arch: macOS
-    - name: Modify template
-      shell: bash
-      run: |
-        python3 .github/workflows/updateVersion.py -T macOS -N ${{ inputs.name }}
-        mv Techmino.love Techmino.app/Contents/Resources
-        mv CCloader.dylib Techmino.app/Contents/Frameworks
-        mv ${{ inputs.icon }} Techmino.app/Contents/Resources/iconfile.icns
-    - name: Codesign executable
-      # In secrets:
-      #   - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64
-      #   - MACOS_CERTIFICATE_PWD: The password
-      shell: bash
-      run: |
-        echo ${{ inputs.MACOS_CERTIFICATE }} | base64 --decode > certificate.p12
-        security create-keychain -p Techminohaowan build.keychain
-        security default-keychain -s build.keychain
-        security unlock-keychain -p Techminohaowan build.keychain
-        security import certificate.p12 -k build.keychain -P ${{ inputs.MACOS_CERTIFICATE_PWD }} -T /usr/bin/codesign
-        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k Techminohaowan build.keychain
-        /usr/bin/codesign --force --deep -s ${{ inputs.MACOS_CERTIFICATE_ID }} Techmino.app -v

.github/actions/build-windows/action.yml

@@ -1,49 +0,0 @@
-name: 'build Windows'
-description: 'build Windows package'
-inputs:
-  love-url:
-    required: true
-  love-dir:
-    required: true
-  arch:
-    required: true
-  version:
-    required: true
-  icon:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - name: Download love
-      uses: ./.github/actions/get-unzip
-      with:
-        url: ${{ inputs.love-url }}
-    - name: move love
-      shell: bash
-      run: mv ${{ inputs.love-dir }} love
-    - name: Download ColdClear
-      uses: ./.github/actions/get-cc
-      with:
-        arch: ${{ inputs.arch }}
-    - name: Download ResourceHacker
-      uses: ./.github/actions/get-unzip
-      with:
-        url: http://www.angusj.com/resourcehacker/resource_hacker.zip
-    - uses: ./.github/actions/build-love
-    - name: Pack Techmino
-      shell: pwsh
-      run: |
-        cmd /c copy /b .\love\love.exe + .\Techmino.love .\love\Techmino.exe
-        del .\love\love.exe
-        del .\love\lovec.exe
-        del .\love\game.ico
-        del .\love\love.ico
-        del .\love\changes.txt
-        del .\love\readme.txt
-        move .\cold_clear.dll .\love
-        move .\CCloader.dll .\love
-        python .\.github\workflows\updateVersion.py -T Windows -N ${{ inputs.version }}
-        cmd /c '.\ResourceHacker.exe -open .\love\Techmino.exe -save .\love\Techmino.exe -action delete -mask ICONGROUP,,'
-        cmd /c '.\ResourceHacker.exe -open .\Techmino.rc -save .\Techmino.res -action compile'
-        cmd /c '.\ResourceHacker.exe -open .\love\Techmino.exe -save .\love\Techmino.exe -action addoverwrite -res "${{ inputs.icon }}" -mask ICONGROUP,1,'
-        cmd /c '.\ResourceHacker.exe -open .\love\Techmino.exe -save .\love\Techmino.exe -action addoverwrite -res ".\Techmino.res" -mask VERSIONINFO,1,'

.github/actions/get-cc/action.yml

@@ -3,8 +3,8 @@ description: 'download cc into specific dir'
 inputs:
   tag:
     required: false
-    default:
-  arch:
+    default: "11.4"
+  platform:
     required: true
   dir:
     required: false
@@ -27,6 +27,6 @@ runs:
       shell: bash
     - uses: ./.github/actions/get-unzip
       with:
-        url: https://github.com/${{ inputs.repo }}/releases/download/${{ steps.get-tag.outputs.tag }}/${{ inputs.arch }}.zip
+        url: https://github.com/${{ inputs.repo }}/releases/download/${{ steps.get-tag.outputs.tag }}/${{ inputs.platform }}.zip
         dir: ${{ inputs.dir }}
         temp-file: ${{ inputs.temp-file }}

.github/actions/snapshot-update/action.yml

@@ -1,12 +0,0 @@
-name: 'update for a snapshot'
-description: 'common update logic for snapshot'
-inputs:
-  commit:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      run: |
-        python3 .github/workflows/updateVersion.py -T Conf
-        python3 .github/workflows/updateVersion.py -T Version -H ${{ inputs.commit }}

.github/actions/update-version/action.yml

@@ -0,0 +1,37 @@
+name: 'update version'
+description: 'common update logic for snapshot and release'
+inputs:
+  commit:
+    required: false
+  type:
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - shell: python
+      name: update snapshot saving folder
+      run: |
+        from io import open
+        if '${{ inputs.type }}'.lower() != 'snapshot':
+          exit(0)
+        with open('conf.lua', 'r+', encoding='utf-8') as file:
+          data = file.read()
+          data = data.replace("t.identity='Techmino'--Saving folder", "t.identity='Techmino_Snapshot'--Saving folder")
+          file.seek(0)
+          file.truncate()
+          file.flush()
+          file.write(data)
+    - shell: python
+      run: |
+        from io import open
+        import re
+        with open('version.lua', 'r+', encoding='utf-8') as file:
+          commitHash = '${{ inputs.commit }}'
+          if commitHash != '':
+            commitHash = '@' + commitHash[0:4]
+          data = file.read()
+          data = re.sub('(\d)"', r'\1' + commitHash + '"', data, 1)
+          file.seek(0)
+          file.truncate()
+          file.flush()
+          file.write(data)

.github/build/Linux/love.template

@@ -1,5 +0,0 @@
-#!/bin/sh
-export LOVE_LAUNCHER_LOCATION="$(dirname "$(which "$0")")"
-export LD_LIBRARY_PATH="${LOVE_LAUNCHER_LOCATION}/lib/x86_64-linux-gnu:${LOVE_LAUNCHER_LOCATION}/usr/bin:${LOVE_LAUNCHER_LOCATION}/usr/lib:${LOVE_LAUNCHER_LOCATION}/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
-/sbin/ldconfig -p | grep -q libstdc++ || export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LOVE_LAUNCHER_LOCATION}/libstdc++/"
-exec ${LOVE_BIN_WRAPPER} "${LOVE_LAUNCHER_LOCATION}/usr/bin/love" "${LOVE_LAUNCHER_LOCATION}/usr/share/Techmino"

.github/build/android/dev/res/mipmap-anydpi-v26/icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>

.github/build/android/dev/res/mipmap-anydpi-v26/icon_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>

.github/build/android/release/res/mipmap-anydpi-v26/icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>

.github/build/android/release/res/mipmap-anydpi-v26/icon_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>

.github/build/iOS/love.patch

@@ -0,0 +1,106 @@
+diff --git a/src/common/ios.h b/src/common/ios.h
+index c1932555..552e432e 100644
+--- a/src/common/ios.h
++++ b/src/common/ios.h
+@@ -66,7 +66,7 @@ std::string getExecutablePath();
+ /**
+  * Causes devices with vibration support to vibrate for about 0.5 seconds.
+  **/
+-void vibrate();
++void vibrate(const double seconds);
+ 
+ /**
+  * Enable mix mode (e.g. with background music apps) and playback with a muted device.
+diff --git a/src/common/ios.mm b/src/common/ios.mm
+index 7730991e..4ba8e708 100644
+--- a/src/common/ios.mm
++++ b/src/common/ios.mm
+@@ -36,6 +36,8 @@
+ #include <SDL_video.h>
+ #include <SDL_syswm.h>
+ 
++#include <sys/utsname.h>
++
+ static NSArray *getLovesInDocuments();
+ static bool deleteFileInDocuments(NSString *filename);
+ 
+@@ -391,10 +393,40 @@ std::string getExecutablePath()
+ 	}
+ }
+ 
+-void vibrate()
++void vibrate(const double seconds)
+ {
+ 	@autoreleasepool
+ 	{
++		struct utsname systemInfo;
++		uname(&systemInfo);
++		NSString *deviceString = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
++		NSRange iPhoneRange = [deviceString rangeOfString:@"iPhone"];
++		if (iPhoneRange.length == 6) {
++			NSRange  commaRange  = [deviceString rangeOfString:@","];
++			NSString *iPhone     = [deviceString substringWithRange:iPhoneRange];
++			NSRange  numRange    = NSMakeRange(iPhoneRange.location + iPhoneRange.length, commaRange.location - iPhoneRange.location - iPhoneRange.length);
++			NSString *num        = [deviceString substringWithRange:numRange];
++
++			if ([num intValue] >= 9) {
++				// iPhone 7 and above, see: https://gist.github.com/adamawolf/3048717#file-apple_mobile_device_types-txt-L22
++
++				if (@available(iOS 10.0, *)) {
++					// iOS 10.0 and above
++					UIImpactFeedbackGenerator *impact = nil;
++					if (seconds >= 0.5 && seconds < 1.5) {
++						impact = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleLight]; // 轻
++					} else if (seconds >= 1.5 && seconds < 2.5) {
++						impact = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium]; // 中
++					} else if (seconds >= 2.5) {
++						impact = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleHeavy]; // 重
++					} else {
++						return;
++					}
++					[impact impactOccurred];
++					return;
++				}
++			}
++		}
+ 		AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+ 	}
+ }
+diff --git a/src/love.cpp b/src/love.cpp
+index c8af8596..ae7a5e32 100644
+--- a/src/love.cpp
++++ b/src/love.cpp
+@@ -140,6 +140,10 @@ enum DoneAction
+ 	DONE_RESTART,
+ };
+ 
++extern "C" {
++	int luaopen_CCloader(lua_State *L);
++}
++
+ static DoneAction runlove(int argc, char **argv, int &retval)
+ {
+ 	// Oh, you just want the version? Okay!
+@@ -158,6 +162,9 @@ static DoneAction runlove(int argc, char **argv, int &retval)
+ 	lua_State *L = luaL_newstate();
+ 	luaL_openlibs(L);
+ 
++	// Init CCloader
++	luaopen_CCloader(L);
++
+ 	// LuaJIT-specific setup needs to be done as early as possible - before
+ 	// get_app_arguments because that loads external library code. This is also
+ 	// loaded inside require("love"). Note that it doesn't use the love table.
+diff --git a/src/modules/system/System.cpp b/src/modules/system/System.cpp
+index e1de16d5..e0f03557 100644
+--- a/src/modules/system/System.cpp
++++ b/src/modules/system/System.cpp
+@@ -174,7 +174,7 @@ void System::vibrate(double seconds) const
+ #ifdef LOVE_ANDROID
+ 	love::android::vibrate(seconds);
+ #elif defined(LOVE_IOS)
+-	love::ios::vibrate();
++	love::ios::vibrate(seconds);
+ #else
+ 	LOVE_UNUSED(seconds);
+ #endif

.github/build/linux/dev/template.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Techmino Development
+Comment=Techmino is fun!
+MimeType=application/x-love-game;
+Exec=app %f
+Type=Application
+Categories=Game;
+Terminal=false
+Icon=icon
+NoDisplay=false

.github/build/linux/release/.gitattributes

@@ -0,0 +1 @@
+*.template text eol=lf

.github/build/linux/release/template.desktop

@@ -1,8 +1,10 @@
 [Desktop Entry]
-Name=Techmino Alpha
+Name=Techmino
 Comment=Techmino is fun!
-Exec=wrapper-love %f
+MimeType=application/x-love-game;
+Exec=app %f
 Type=Application
 Categories=Game;
 Terminal=false
 Icon=icon
+NoDisplay=false