Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-01 18:50:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated sector submissions, fixed crash

Browse Source
This commit is contained in:
Anuken
2026-07-05 12:00:04 -04:00
parent 028f1036fb
commit a64aae1d78
10 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/maps/serpulo/hidden/111.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/hidden/20.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/hidden/245.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/hidden/263.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/hidden/6.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/hidden/67.msav
BIN
View File
Binary file not shown.
core/assets/maps/serpulo/littoralShipyard.msav
BIN
View File
Binary file not shown.
core/src/mindustry/audio/SoundControl.java
+1 -1
View File
@@ -377,7 +377,7 @@ public class SoundControl{
//start thread with all the sources that were added during launch
Core.app.post(() -> {
if(ambientThread != null){
ambientThread.start();
if(!ambientThread.isAlive()) ambientThread.start();
launchingAmbientThread = false;
}
});
core/src/mindustry/maps/SectorSubmissions.java
+5 -5
View File
@@ -28,7 +28,7 @@ public class SectorSubmissions{
register(76, "Tyrant-classZzz", "https://discord.com/channels/391020510269669376/1379926833411391580/1479890094486716499", extreme);
register(47, "tinport", "https://discord.com/channels/391020510269669376/1379926802591645820/1481778410018570274", extreme);
register(225, "Summi", "https://discord.com/channels/391020510269669376/1379926925719376152/1419026814826709103", extreme);
register(111, "enwyz", "https://discord.com/channels/391020510269669376/1379926842659569864/1517216621616169084", extreme);
register(111, "enwyz", "https://discord.com/channels/391020510269669376/1379926842659569864/1523343841472675853", eradication);
register(176, "wpx", "https://discord.com/channels/391020510269669376/1379926887203213353/1419025548696621209", extreme);
register(13, "chocomint", "https://discord.com/channels/391020510269669376/1379926785164312810/1518092246300229677", extreme);
register(259, "tinport", "https://discord.com/channels/391020510269669376/1379928048245280871/1381300770866987049", extreme);
@@ -41,7 +41,7 @@ public class SectorSubmissions{
register(69, "Oct", "https://discord.com/channels/391020510269669376/1379926831326822610/1406230980120940556", high);
register(92, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926835621527615/1484550444369051772", high);
register(197, "Hengryton Luck", "https://discord.com/channels/391020510269669376/1379926916911599676/1423257237341863966", extreme);
register(67, "Ếch ngồi đáy giếng", "https://discord.com/channels/391020510269669376/1379926828696866898/1389981795386396768", extreme);
register(67, "-RosaliaGream-", "https://discord.com/channels/391020510269669376/1379926828696866898/1523254871187521589", eradication);
//180 has an alternate submission that may be more appropriate in terms of difficulty: https://discord.com/channels/391020510269669376/1379926889648619580/1411534650412892185
register(180, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926889648619580/1426523800815538178", extreme);
register(55, "Amomogus391", "https://discord.com/channels/391020510269669376/1379926823277695189/1478733623829200910", eradication);
@@ -50,11 +50,11 @@ public class SectorSubmissions{
//191 has several alternate submissions
register(191, "tinport", "https://discord.com/channels/391020510269669376/1379926912004001914/1421139764819660884", eradication);
//alternate, more difficult submission: https://discord.com/channels/391020510269669376/1379926782966497322/1416145231853781022
register(6, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926782966497322/1516634498307985460", extreme);
register(6, "Locla^Glass", "https://discord.com/channels/391020510269669376/1506531529847869590/1522968348575400129", extreme);
register(265, "Dem0", "https://discord.com/channels/391020510269669376/1379928052921929891/1450757980206137359", extreme);
register(161, "Hengryton Luck", "https://discord.com/channels/391020510269669376/1379926882203730024/1416686287204782217", extreme);
register(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1419213541512187935", extreme);
register(263, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379928050010951694/1518065606161862710", eradication);
register(263, "Locla^Glass", "https://discord.com/channels/391020510269669376/1506531529847869590/1522968537256300677", eradication);
register(66, "quad", "https://discord.com/channels/391020510269669376/1379926825941078128/1419165493008535706", extreme);
register(248, "iqtik123", "https://discord.com/channels/391020510269669376/1379926979129774151/1417864622412922890", high);
register(133, "wpx", "https://discord.com/channels/391020510269669376/1379926871227240770/1419018550932279440", extreme);
@@ -75,7 +75,7 @@ public class SectorSubmissions{
register(242, "cyan", "https://discord.com/channels/391020510269669376/1379926873152164004/1470268689201889464", eradication);
register(243, "Jamespire", "https://discord.com/channels/391020510269669376/1379926876457537547/1484013941477609543", eradication);
register(247, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926976361533752/1431827990295220266", eradication);
register(245, "Grushashusha", "https://discord.com/channels/391020510269669376/1379926971286290584/1485245072034365462", eradication);
register(245, "Grushashusha", "https://discord.com/channels/391020510269669376/1379926971286290584/1523071426033221733", eradication);
register(27, "Stormrider", "https://discord.com/channels/391020510269669376/1379926798833287289/1451252137224044722", unreasonable)
.showHidden = true;
core/src/mindustry/mod/Mods.java
+5 -1
View File
@@ -33,7 +33,11 @@ import static mindustry.Vars.*;
public class Mods implements Loadable{
private static final String[] metaFiles = {"mod.json", "mod.hjson", "plugin.json", "plugin.hjson"};
//it would be nice to parse semver and have syntax like "<1.0.5" here, but mods clearly don't use semver and it's an inconsistent mess
private static final ObjectSet<String> blacklistedMods = ObjectSet.with("ui-lib", "braindustry", "schema", "scheme-size:1.0.5", "scheme-size:1.0.4", "scheme-size:1.0.3", "scheme-size:1.0.1", "scheme-size:1.0.0", "scheme-size:1.1.0", "scheme-size:1.0.4.1");
private static final ObjectSet<String> blacklistedMods = ObjectSet.with(
"ui-lib", "braindustry", "schema", "scheme-size:1.0.5", "scheme-size:1.0.4", "scheme-size:1.0.3", "scheme-size:1.0.1", "scheme-size:1.0.0", "scheme-size:1.1.0", "scheme-size:1.0.4.1",
//new patch API as of build 159 breaks older versions of the patch editor
"patch-editor:1.10.1", "patch-editor:1.10.0", "patch-editor:1.9.5", "patch-editor:1.9.4", "patch-editor:1.9.3"
);
private Json json = new Json();
private @Nullable Scripts scripts;