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

Merge remote-tracking branch 'origin/master' into v9

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_ca.properties
#	core/assets/scripts/global.js
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
#	tools/src/mindustry/tools/SchemaGenerator.java
This commit is contained in:
Anuken
2026-08-14 12:20:03 -04:00
parent c5d67a56fd e8bf80a1d2
commit e26205a4f7
59 changed files with 900 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/scripts/global.js
+13
View File
@@ -48,15 +48,27 @@ const Arrays = Packages.java.util.Arrays
const TextureFilter = Packages.arc.graphics.TextureFilter
const TextureWrap = Packages.arc.graphics.TextureWrap
importPackage(Packages.arc)
importPackage(Packages.arc.assets)
importPackage(Packages.arc.assets.loaders)
importPackage(Packages.arc.audio)
importPackage(Packages.arc.backend.headless)
importPackage(Packages.arc.files)
importPackage(Packages.arc.flabel)
importPackage(Packages.arc.freetype)
importPackage(Packages.arc.func)
importPackage(Packages.arc.fx)
importPackage(Packages.arc.fx.filters)
importPackage(Packages.arc.fx.util)
importPackage(Packages.arc.graphics)
importPackage(Packages.arc.graphics.g3d)
importPackage(Packages.arc.graphics.g2d)
importPackage(Packages.arc.input)
importPackage(Packages.arc.math)
importPackage(Packages.arc.math.geom)
importPackage(Packages.arc.mock)
importPackage(Packages.arc.net)
importPackage(Packages.arc.net.dns)
importPackage(Packages.arc.packer)
importPackage(Packages.arc.scene)
importPackage(Packages.arc.scene.actions)
importPackage(Packages.arc.scene.event)
@@ -194,6 +206,7 @@ const LaunchItemEvent = Packages.mindustry.game.EventType.LaunchItemEvent
const SectorInvasionEvent = Packages.mindustry.game.EventType.SectorInvasionEvent
const SectorLoseEvent = Packages.mindustry.game.EventType.SectorLoseEvent
const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent
const TextureStreamEvent = Packages.mindustry.game.EventType.TextureStreamEvent
const DataPatchLoadEvent = Packages.mindustry.game.EventType.DataPatchLoadEvent
const WorldLoadEndEvent = Packages.mindustry.game.EventType.WorldLoadEndEvent
const WorldLoadBeginEvent = Packages.mindustry.game.EventType.WorldLoadBeginEvent