Merge branch 'master' into master

.github/workflows/EveryAutoCommitMessage.md → .github/workflows/AutoReleaseMsg.md

@@ -1,16 +1,16 @@
-This build is generated for every commit and will be available on the global mod list instantly thanks to [*
-Anuken/MindustryMods*](https://github.com/Anuken/MindustryMods). The mod browser in the game will automatically download
+This building is auto-released and will be available on the global mod list instantly thanks to [* Anuken/MindustryMods *](https://github.com/Anuken/MindustryMods).
+
+The mod browser in the game will automatically download
 the mod from this release because it will always be the latest release.
 
 ## How to install current release
-
+#### Directly download
 1. Download the JAR file, it should have the name *"CyberIO.jar"*
 2. Move it to *Mindustry*'s mods directory:
     - **Linux**: `$HOME/.local/share/Mindustry/mods/`
     - **MacOS**: `$HOME/Library/Application Support/Mindustry/mods/`
     - **Steam**: `steam/steamapps/common/Mindustry/mods/`
     - **Windows**:`%AppData%/Mindustry/mods/`
+#### Search in Mod Browser
+You can search for the mod's name -- **"CyberIO"** by the **"Mod Browser"** in game.
 
-## How to install a stable one
-
-Or you can search for the mod's name -- **"CyberIO"** by the **"Mod Browser"** in game.

.github/workflows/AutoReleaseWhenPush.yml

@@ -23,12 +23,12 @@ jobs:
       - name: Build Cyber-IO
         run: |
           chmod +x gradlew
-          ./gradlew deploy
+          ./gradlew :main:deploy
 
       - uses: actions/upload-artifact@v2
         with:
-          name: Cyber-IO-byLiplum
-          path: build/libs/*.jar
+          name: CyberIO-Jar
+          path: main/build/libs/*.jar
 
   upload:
     needs: build
@@ -41,7 +41,7 @@ jobs:
 
       - uses: actions/download-artifact@v2
         with:
-          name: Cyber-IO-byLiplum
+          name: CyberIO-Jar
           path: out
 
       - name: Delete and recreate tag
@@ -57,4 +57,4 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TODAY: ${{ steps.date.outputs.date }}
-        run: gh release create AUTOR --title "Auto-release on $TODAY" --notes-file "$GITHUB_WORKSPACE/.github/workflows/EveryAutoCommitMessage.md" out/*.jar
+        run: gh release create AUTOR --title "Auto-release on $TODAY" --notes-file "$GITHUB_WORKSPACE/.github/workflows/AutoReleaseMsg.md" out/*.jar

.github/workflows/TestBuildWhenPullRequest.yml

@@ -16,7 +16,9 @@ jobs:
         with:
           java-version: 16
       - name: Build mod jar
-        run: chmod +x gradlew && ./gradlew deploy
+        run: |
+          chmod +x gradlew
+          ./gradlew :main:deploy
       - name: Upload built jar file
         uses: actions/upload-artifact@v2
         with:

.github/workflows/TestWhenPush.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Test CyberIO
         run: |
           chmod +x gradlew
-          ./gradlew test
+          ./gradlew :main:test

.gitignore

@@ -160,8 +160,13 @@ android/libs/
 run
 cache
 
-#OpenGAL
+## OpenGAL
 *.node
 
-#Python
-__pycache__/
+## Python
+__pycache__/
+
+## Gradle :main project
+main/build
+buildSrc/build
+extra

ForServer.md → Info/ForServer.md

@@ -12,7 +12,7 @@ Cyber IO supports auto-update when you run it on the server version, whether you
 
 For security, auto-update is disabled as default in the config. 
 
-Cyber IO will check the latest version from [update info file](update) on this GitHub repository.
+Cyber IO will check the latest version from [update info file](../update) on this GitHub repository.
 To do so, you should keep the network be able to access GitHub and firewall open at a specific port.
 
 ### Reload or Reset Config by Command in-game

Info/SafelyWorkWith.md

@@ -0,0 +1,211 @@
+# Cyber IO can work with X safely
+
+The tests on this page has **only** referenced value and doesn't guarantee the accuracy.
+
+And the list below is **only** used to record the result on a specific version. Thus, they have timeliness and should be
+tested again soon.
+
+Therefore, if any result is outdated or wrong, please new an issue.
+
+Tip: Using **Ctrl-F** to search for the mod you want is an easy way.
+
+---
+
+### Single Test
+
+All tests **only** considered Cyber IO works with a single mod once.
+
+
+| Mod Name             | Version | Safe | Mod ID    | Note                                                                |
+|----------------------|---------|------|-----------|---------------------------------------------------------------------|
+| Progressed Mindustry | v24     | Y    | prog-mats | Fixed CritBulletType and RiftBulletType with Prism will crash game. |
+|                      |         |      |           |                                                                     |
+
+---
+
+### Mod Pack
+
+- Diamond Ore Mod v2.6.0 + New Horizon v1.11.0.6.1 + Spore Biomechs v1.3.5
+
+- [X]  Fine.
+
+- Sapphirium v13.0 + DiverseTech v0.2.2 + Mindustry-Extended v1.09 + Opore Mod v69 + Missing Category Units v0.2.2 +
+  Substructure v0.1.1 + United Network of Industries vaplha v1.0
+- Exotic Mod v0.7 Alpha + Progressed Materials v23.7 + Unlimited Armament Works v0.7.8.1 + Exogenesis v1.4 + Sharustry
+  v0.2v
+
+- [X]  Fine.
+
+- Exotic Mod v0.7 Alpha + Progressed Materials v23.7 + Unlimited Armament Works v0.7.8.1
+
+- [X]  Fine.
+
+---
+
+### Test List
+
+All tests **only** considered Cyber IO works with a single mod once.
+
+- Progressed Mindustry (prog-mats) v24.0
+
+- [X]  Fixed CritBulletType and RiftBulletType
+
+- Progressed Materials(Java) (prog-mats) v24.0
+
+- [X]  Fixed the unlimited duplicate magnet bullet.
+
+- BetaMindy(betamindy) v1.08
+
+- [X]  OK, sk7725.
+
+- Singularity
+
+- [ ]  Can't download it.
+
+- MoreDefences(more-defences-ivgx) v1.0
+
+- [X]  OK.
+
+- Project Eclipse(mindus) v0.1.0.3
+
+- [X]  Bliz's bullets through over Prism may make problems.
+
+- Spore Biomechs(sporepod) v1.3
+
+- [X]  OK.
+
+- Dimension Shard(dimension-shard) v0.24.2
+
+- [X]  This mod can't be played and might be WIP.
+
+- Unit Factory v2.5.0
+
+- [X]  Multiplayer Compatible
+
+- Mindustry Classicified
+
+- [X]  A texture pack is always ok.
+
+- Inverted machines(inverted-machines) v1.4
+
+- [X]  SmartDistributor accepts those inverted machines.
+
+- Schematics Pack
+
+- [X]  I'm afraid it may destroy my saves, so just skip it.
+
+- Real Life Mod(real-life-mindustry-mod) v2.0
+
+- [X]  No war.
+
+- UNI
+
+- [ ]  Authors, Qwaka and plolq, will consume me. Just RUN AWAY from v135.
+
+- oxynoe v1
+
+- [X]  oxynoe
+
+- Animalia(animalia) v0.1.2
+
+- [X]  It's hard to test. I guess it's ok.
+
+- Substructure (substructure) v0.1.1
+
+- [ ]  Can't work on v135
+
+- Sapphirium(adc) v13.0
+
+- [X]  OK
+
+- Opore Mod(opore-mod) v69
+
+- [X]  OK.
+
+- Mindustry-Extended(me) v1.09
+
+- [X]  Sprinkler with Prism may make troubles.
+
+- GRavillaso
+
+- [ ]  It uses Java 16, but I use Java 8. Can't test it.
+
+- Developer Mode v2.3.2
+
+- [X]  That's ok for me:)
+
+- Multi Lib
+
+- [X]  Maybe it can work, but Cyber IO has SmartDistributor.
+
+- Esoterum(esoterum) v2.11-119
+
+- [X]  I like music.
+
+- (v6)Invincible Cheat(invincible-cheat-mod-v6)
+
+- [X]  OK
+
+- Endless Rusting Demo
+
+- [ ]  WIP mod. Skip.
+
+- Portal
+
+- [ ]  Can't download mod.
+
+- Progressed Materials(Java) (prog-mats) v23.7
+
+- [X]  Attraction's bullets through over Prism will **CAUSE CRASH**
+
+- Example Mod(testmod) v1.4.9
+
+- [X]  OK
+
+- Lead Industries(lead_ind) v1.5.1
+
+- [X]  Enjoy banana!
+
+- Unlimited Armament Works(uaw) v0.7.8.1
+
+- [X]  Be careful playing Buckshoot or StrikeForce with Prism
+
+- RTFM v2.15.0
+
+- [X]  Multiplayer Compatible
+
+- routorio(routorio) v2.36.4
+
+- [X]  Router!
+
+- UI Lib(ui-lib)
+
+- [X]  Multiplayer Compatible
+
+- PicToLogic
+
+- [X]  Multiplayer Compatible
+
+- Gold Mod(goldmod) v2.0 alpha b19
+
+- [X]  OK.
+
+- Pixelcraft: The endless rust(pixelcraft) v0.9.85
+
+- [X]  Carefully use Prism,in CyberIO, with Shade, Panic or others that can shoot a lots of bullets.
+
+- Diamond Ore Mod(diamond-ore) v2.6.0
+
+- [X]  OK
+
+- Hackustry v4\
+
+- [X]  Server plugin. Ignored.
+
+- Exotic Mod(exotic-mod) v0.7 Alpha\
+
+- [X]  OK
+
+- New Horizon(new-horizon) v1.11.0.6.1\
+
+- [X]  You should notice the memery usage.

README.md

@@ -17,14 +17,14 @@ To learn about playing Cyber IO, you can check [the wiki](https://github.com/lip
 
 #### Mod Compatibility
 
-If you'd like to play a mod pack, [there is a rough test](SafelyWorkWith.md) of inter-mod compatibility as a reference
+If you'd like to play a mod pack, [there is a rough test](Info/SafelyWorkWith.md) of inter-mod compatibility as a reference
 for you.
 
 *Note: Every mod could update and might break the result, please think and test on your own.*
 
 #### For Server
 
-Please [check this file](ForServer.md) to learn more about running Cyber IO on a server.
+Please [check this file](Info/ForServer.md) to learn more about running Cyber IO on a server.
 ___
 
 ### IC Machine
@@ -54,21 +54,26 @@ ___
 **IN NO ORDER**
 
 * The friendly people on Discord whoever have ever helped me.
+* Anyone who committed any issue or made any pull request on GitHub.
+* Anyone who likes CyberIO.
+* And you.
 
-* Anyone who committed the issue or made pull request on GitHub.
+### Translation
 
-* Anyone who likes CyberIO.
+- Ukrainian -> Prosta4ok_ua#6336
+- Chinese Simplified -> woodjecket#0554
+- Japanese -> 星華輝月#2243
 
-### For Contributors
+### For Contributor
 
 Everyone is welcome to contribute Cyber IO.
 
-If you want to translate or programme cooperatively. Please [check this file](ForContributors.md) to learn how to join
+If you want to translate or programme cooperatively. Please [check this file](Info/ForContributors.md) to learn how to join
 us.
 ___
 
 ## Licence
 
 The codes of CyberIO are open source in GNU General Public License v3.0 (GPL 3.0).
 
-To learn about the resources of CyberIO, please check the [Copyright File](Copyright.md).
+To learn about the resources of CyberIO, please check the [Copyright File](Info/Copyright.md).