Skip to content

Commit 073f112

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 21b5101 + 48399b7 commit 073f112

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

core/src/mindustry/game/EventType.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import mindustry.core.GameState.*;
77
import mindustry.ctype.*;
88
import mindustry.gen.*;
9+
import mindustry.graphics.MultiPacker;
910
import mindustry.net.*;
1011
import mindustry.net.Packets.*;
1112
import mindustry.type.*;
@@ -87,7 +88,13 @@ public static class BlockInfoEvent{}
8788
/** Called *after* all content has been initialized. */
8889
public static class ContentInitEvent{}
8990
/** Called *after* all content has been added to the atlas, but before its pixmaps are disposed. */
90-
public static class AtlasPackEvent{}
91+
public static class AtlasPackEvent{
92+
public final MultiPacker multiPacker;
93+
94+
public AtlasPackEvent(MultiPacker multiPacker){
95+
this.multiPacker = multiPacker;
96+
}
97+
}
9198
/** Called *after* all mod content has been loaded, but before it has been initialized. */
9299
public static class ModContentLoadEvent{}
93100
/** Called when the client game is first loaded. */

core/src/mindustry/mod/Mods.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public PixmapRegion getPixmap(AtlasRegion region){
337337

338338
packer.printStats();
339339

340-
Events.fire(new AtlasPackEvent());
340+
Events.fire(new AtlasPackEvent(packer));
341341

342342
packer.dispose();
343343

0 commit comments

Comments
 (0)