From b11908f5091f0915725391ab196dff850f867e5e Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 4 Aug 2020 15:14:01 -0400 Subject: [PATCH] Event things --- core/assets/scripts/base.js | 4 - core/assets/scripts/global.js | 122 +++++++++--------- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/mod/Scripts.java | 5 - .../mindustry/ui/fragments/HudFragment.java | 2 +- .../src/mindustry/desktop/steam/SStats.java | 14 +- gradle.properties | 2 +- .../src/mindustry/server/ServerControl.java | 4 +- .../mindustry/tools/ScriptStubGenerator.java | 1 + 9 files changed, 72 insertions(+), 84 deletions(-) diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index fd26193065..3d8073e48e 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -4,10 +4,6 @@ const log = function(context, obj){ Vars.mods.getScripts().log(context, String(obj)) } -const onEvent = function(event, handler){ - Vars.mods.getScripts().onEvent(event, handler) -} - const readString = path => Vars.mods.getScripts().readString(path) const readBytes = path => Vars.mods.getScripts().readBytes(path) diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 4f2843c3a1..daeaa17942 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -6,10 +6,6 @@ const log = function(context, obj){ Vars.mods.getScripts().log(context, String(obj)) } -const onEvent = function(event, handler){ - Vars.mods.getScripts().onEvent(event, handler) -} - const readString = path => Vars.mods.getScripts().readString(path) const readBytes = path => Vars.mods.getScripts().readBytes(path) @@ -30,74 +26,74 @@ const extend = function(classType, params){ const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) Call = Packages.mindustry.gen.Call -importPackage(Packages.mindustry.maps) -importPackage(Packages.mindustry.world.blocks.production) -importPackage(Packages.mindustry.graphics.g3d) -importPackage(Packages.mindustry.ai.types) -importPackage(Packages.mindustry.world.draw) -importPackage(Packages.mindustry.game) -importPackage(Packages.mindustry.logic) -importPackage(Packages.mindustry.entities.comp) -importPackage(Packages.mindustry.world.blocks.sandbox) -importPackage(Packages.mindustry.world.consumers) -importPackage(Packages.mindustry.type) -importPackage(Packages.mindustry.maps.filters) +importPackage(Packages.arc) +importPackage(Packages.arc.func) +importPackage(Packages.arc.graphics) +importPackage(Packages.arc.graphics.g2d) +importPackage(Packages.arc.math) +importPackage(Packages.arc.math.geom) +importPackage(Packages.arc.scene) +importPackage(Packages.arc.scene.actions) +importPackage(Packages.arc.scene.event) +importPackage(Packages.arc.scene.style) +importPackage(Packages.arc.scene.ui) +importPackage(Packages.arc.scene.ui.layout) +importPackage(Packages.arc.scene.utils) importPackage(Packages.arc.struct) -importPackage(Packages.mindustry.world.meta.values) -importPackage(Packages.mindustry.world.blocks.distribution) -importPackage(Packages.mindustry.ui.dialogs) +importPackage(Packages.arc.util) +importPackage(Packages.mindustry) +importPackage(Packages.mindustry.ai) +importPackage(Packages.mindustry.ai.formations) +importPackage(Packages.mindustry.ai.formations.patterns) +importPackage(Packages.mindustry.ai.types) +importPackage(Packages.mindustry.async) +importPackage(Packages.mindustry.audio) +importPackage(Packages.mindustry.content) +importPackage(Packages.mindustry.core) +importPackage(Packages.mindustry.ctype) +importPackage(Packages.mindustry.editor) +importPackage(Packages.mindustry.entities) +importPackage(Packages.mindustry.entities.abilities) +importPackage(Packages.mindustry.entities.bullet) +importPackage(Packages.mindustry.entities.comp) +importPackage(Packages.mindustry.entities.units) +importPackage(Packages.mindustry.game) importPackage(Packages.mindustry.gen) importPackage(Packages.mindustry.graphics) -importPackage(Packages.arc.scene.ui) -importPackage(Packages.mindustry.ai) -importPackage(Packages.mindustry.content) -importPackage(Packages.mindustry.ctype) -importPackage(Packages.arc.scene.event) -importPackage(Packages.mindustry.entities.bullet) -importPackage(Packages.arc.math.geom) +importPackage(Packages.mindustry.graphics.g3d) +importPackage(Packages.mindustry.input) +importPackage(Packages.mindustry.logic) +importPackage(Packages.mindustry.maps) +importPackage(Packages.mindustry.maps.filters) +importPackage(Packages.mindustry.maps.generators) +importPackage(Packages.mindustry.maps.planet) +importPackage(Packages.mindustry.type) importPackage(Packages.mindustry.ui) -importPackage(Packages.mindustry.ai.formations) -importPackage(Packages.arc.func) +importPackage(Packages.mindustry.ui.dialogs) importPackage(Packages.mindustry.ui.fragments) -importPackage(Packages.mindustry.world.blocks.units) -importPackage(Packages.mindustry.world.modules) -importPackage(Packages.mindustry.world.blocks.power) -importPackage(Packages.arc.scene.utils) -importPackage(Packages.mindustry.entities) -importPackage(Packages.mindustry.audio) -importPackage(Packages.arc.math) -importPackage(Packages.arc.scene.ui.layout) -importPackage(Packages.arc.scene.actions) -importPackage(Packages.arc.scene.style) -importPackage(Packages.mindustry.world.blocks.defense.turrets) -importPackage(Packages.mindustry.core) -importPackage(Packages.arc.scene) -importPackage(Packages.mindustry.entities.units) -importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.ui.layout) importPackage(Packages.mindustry.world) importPackage(Packages.mindustry.world.blocks) -importPackage(Packages.mindustry.editor) -importPackage(Packages.mindustry.world.blocks.storage) -importPackage(Packages.mindustry.world.blocks.environment) -importPackage(Packages.mindustry.async) -importPackage(Packages.mindustry.maps.planet) -importPackage(Packages.mindustry.world.blocks.liquid) -importPackage(Packages.mindustry.ai.formations.patterns) -importPackage(Packages.mindustry.ui.layout) -importPackage(Packages.mindustry.input) -importPackage(Packages.mindustry.world.blocks.legacy) -importPackage(Packages.mindustry.entities.abilities) -importPackage(Packages.mindustry) -importPackage(Packages.mindustry.world.meta) -importPackage(Packages.mindustry.world.blocks.experimental) -importPackage(Packages.mindustry.world.blocks.payloads) -importPackage(Packages.mindustry.maps.generators) -importPackage(Packages.arc.graphics.g2d) -importPackage(Packages.arc.util) importPackage(Packages.mindustry.world.blocks.campaign) -importPackage(Packages.arc.graphics) +importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.world.blocks.defense.turrets) +importPackage(Packages.mindustry.world.blocks.distribution) +importPackage(Packages.mindustry.world.blocks.environment) +importPackage(Packages.mindustry.world.blocks.experimental) +importPackage(Packages.mindustry.world.blocks.legacy) +importPackage(Packages.mindustry.world.blocks.liquid) +importPackage(Packages.mindustry.world.blocks.payloads) +importPackage(Packages.mindustry.world.blocks.power) +importPackage(Packages.mindustry.world.blocks.production) +importPackage(Packages.mindustry.world.blocks.sandbox) +importPackage(Packages.mindustry.world.blocks.storage) +importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.mindustry.world.consumers) +importPackage(Packages.mindustry.world.draw) +importPackage(Packages.mindustry.world.meta) +importPackage(Packages.mindustry.world.meta.values) +importPackage(Packages.mindustry.world.modules) importPackage(Packages.mindustry.world.producers) -importPackage(Packages.arc) const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 920a9c38ab..2b3c81d5a8 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -171,7 +171,7 @@ public class Control implements ApplicationListener, Loadable{ } }); - Events.on(Trigger.newGame, () -> { + Events.run(Trigger.newGame, () -> { Building core = player.closestCore(); if(core == null) return; diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 19600763b0..5dd40045c0 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -2,7 +2,6 @@ package mindustry.mod; import arc.*; import arc.files.*; -import arc.func.*; import arc.struct.*; import arc.util.*; import arc.util.Log.*; @@ -76,10 +75,6 @@ public class Scripts implements Disposable{ //utility mod functions - public void onEvent(Class type, Cons listener){ - Events.on(type, listener); - } - public String readString(String path){ return Vars.tree.get(path, true).readString(); } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 7cfa39400a..d1eae438a2 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -241,7 +241,7 @@ public class HudFragment extends Fragment{ float[] coreAttackTime = {0}; float[] coreAttackOpacity = {0}; - Events.on(Trigger.teamCoreDamage, () -> { + Events.run(Trigger.teamCoreDamage, () -> { coreAttackTime[0] = notifDuration; }); diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index dcd51d6e87..71420d8ed7 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -93,7 +93,7 @@ public class SStats implements SteamUserStatsCallback{ //} }); - Events.on(Trigger.newGame, () -> Core.app.post(() -> { + Events.run(Trigger.newGame, () -> Core.app.post(() -> { if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){ drop10kitems.complete(); } @@ -153,11 +153,11 @@ public class SStats implements SteamUserStatsCallback{ } }); - Events.on(Trigger.openWiki, openWiki::complete); + Events.run(Trigger.openWiki, openWiki::complete); - Events.on(Trigger.exclusionDeath, dieExclusion::complete); + Events.run(Trigger.exclusionDeath, dieExclusion::complete); - Events.on(Trigger.drown, drown::complete); + Events.run(Trigger.drown, drown::complete); trigger(Trigger.impactPower, powerupImpactReactor); @@ -167,9 +167,9 @@ public class SStats implements SteamUserStatsCallback{ trigger(Trigger.suicideBomb, suicideBomb); - Events.on(Trigger.enablePixelation, enablePixelation::complete); + Events.run(Trigger.enablePixelation, enablePixelation::complete); - Events.on(Trigger.thoriumReactorOverheat, () -> { + Events.run(Trigger.thoriumReactorOverheat, () -> { if(campaign()){ SStat.reactorsOverheated.add(); } @@ -264,7 +264,7 @@ public class SStats implements SteamUserStatsCallback{ } private void trigger(Trigger trigger, SAchievement ach){ - Events.on(trigger, () -> { + Events.run(trigger, () -> { if(campaign()){ ach.complete(); } diff --git a/gradle.properties b/gradle.properties index 232aabf151..1da478fdec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=67c4b5cb3c52f5267bbcb4ecfe7134676664c3c2 +archash=37a42909cbc4b857437ca29a132edbe05db76989 diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 6e9050291a..b33430ca0b 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -161,7 +161,7 @@ public class ServerControl implements ApplicationListener{ }); //autosave periodically - Events.on(Trigger.update, () -> { + Events.run(Trigger.update, () -> { if(state.isPlaying() && Config.autosave.bool()){ if(autosaveCount.get(Config.autosaveSpacing.num() * 60)){ int max = Config.autosaveAmount.num(); @@ -194,7 +194,7 @@ public class ServerControl implements ApplicationListener{ } }); - Events.on(Trigger.socketConfigChanged, () -> { + Events.run(Trigger.socketConfigChanged, () -> { toggleSocket(false); toggleSocket(Config.socketInput.bool()); }); diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index 46fcf6a7bb..6a4d90d9b0 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -41,6 +41,7 @@ public class ScriptStubGenerator{ classes.removeAll(type -> type.isSynthetic() || type.isAnonymousClass() || type.getCanonicalName() == null || Modifier.isPrivate(type.getModifiers()) || blacklist.contains(s -> type.getName().startsWith(base + "." + s + ".")) || nameBlacklist.contains(type.getSimpleName())); classes.distinct(); + classes.sortComparing(Class::getName); ObjectSet used = ObjectSet.with(); StringBuilder result = new StringBuilder("//Generated class. Do not modify.\n");