Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Event things

Browse Source
This commit is contained in:
Anuken
2020-08-04 15:14:01 -04:00
parent 0d4e75fc42
commit b11908f509
9 changed files with 72 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/scripts/base.js
View File

@@ -4,10 +4,6 @@ const log = function(context, obj){
Vars.mods.getScripts().log(context, String(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 readString = path => Vars.mods.getScripts().readString(path)
const readBytes = path => Vars.mods.getScripts().readBytes(path) const readBytes = path => Vars.mods.getScripts().readBytes(path)

122
core/assets/scripts/global.js
View File

@@ -6,10 +6,6 @@ const log = function(context, obj){
Vars.mods.getScripts().log(context, String(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 readString = path => Vars.mods.getScripts().readString(path)
const readBytes = path => Vars.mods.getScripts().readBytes(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})) const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
Call = Packages.mindustry.gen.Call Call = Packages.mindustry.gen.Call
importPackage(Packages.mindustry.maps) importPackage(Packages.arc)
importPackage(Packages.mindustry.world.blocks.production) importPackage(Packages.arc.func)
importPackage(Packages.mindustry.graphics.g3d) importPackage(Packages.arc.graphics)
importPackage(Packages.mindustry.ai.types) importPackage(Packages.arc.graphics.g2d)
importPackage(Packages.mindustry.world.draw) importPackage(Packages.arc.math)
importPackage(Packages.mindustry.game) importPackage(Packages.arc.math.geom)
importPackage(Packages.mindustry.logic) importPackage(Packages.arc.scene)
importPackage(Packages.mindustry.entities.comp) importPackage(Packages.arc.scene.actions)
importPackage(Packages.mindustry.world.blocks.sandbox) importPackage(Packages.arc.scene.event)
importPackage(Packages.mindustry.world.consumers) importPackage(Packages.arc.scene.style)
importPackage(Packages.mindustry.type) importPackage(Packages.arc.scene.ui)
importPackage(Packages.mindustry.maps.filters) importPackage(Packages.arc.scene.ui.layout)
importPackage(Packages.arc.scene.utils)
importPackage(Packages.arc.struct) importPackage(Packages.arc.struct)
importPackage(Packages.mindustry.world.meta.values) importPackage(Packages.arc.util)
importPackage(Packages.mindustry.world.blocks.distribution) importPackage(Packages.mindustry)
importPackage(Packages.mindustry.ui.dialogs) 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.gen)
importPackage(Packages.mindustry.graphics) importPackage(Packages.mindustry.graphics)
importPackage(Packages.arc.scene.ui) importPackage(Packages.mindustry.graphics.g3d)
importPackage(Packages.mindustry.ai) importPackage(Packages.mindustry.input)
importPackage(Packages.mindustry.content) importPackage(Packages.mindustry.logic)
importPackage(Packages.mindustry.ctype) importPackage(Packages.mindustry.maps)
importPackage(Packages.arc.scene.event) importPackage(Packages.mindustry.maps.filters)
importPackage(Packages.mindustry.entities.bullet) importPackage(Packages.mindustry.maps.generators)
importPackage(Packages.arc.math.geom) importPackage(Packages.mindustry.maps.planet)
importPackage(Packages.mindustry.type)
importPackage(Packages.mindustry.ui) importPackage(Packages.mindustry.ui)
importPackage(Packages.mindustry.ai.formations) importPackage(Packages.mindustry.ui.dialogs)
importPackage(Packages.arc.func)
importPackage(Packages.mindustry.ui.fragments) importPackage(Packages.mindustry.ui.fragments)
importPackage(Packages.mindustry.world.blocks.units) importPackage(Packages.mindustry.ui.layout)
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.world) importPackage(Packages.mindustry.world)
importPackage(Packages.mindustry.world.blocks) 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.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.mindustry.world.producers)
importPackage(Packages.arc)
const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent
const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent
const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent

2
core/src/mindustry/core/Control.java
View File

@@ -171,7 +171,7 @@ public class Control implements ApplicationListener, Loadable{
} }
}); });
Events.on(Trigger.newGame, () -> { Events.run(Trigger.newGame, () -> {
Building core = player.closestCore(); Building core = player.closestCore();
if(core == null) return; if(core == null) return;

5
core/src/mindustry/mod/Scripts.java
View File

@@ -2,7 +2,6 @@ package mindustry.mod;
import arc.*; import arc.*;
import arc.files.*; import arc.files.*;
import arc.func.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.Log.*; import arc.util.Log.*;
@@ -76,10 +75,6 @@ public class Scripts implements Disposable{
//utility mod functions //utility mod functions
public <T> void onEvent(Class<T> type, Cons<T> listener){
Events.on(type, listener);
}
public String readString(String path){ public String readString(String path){
return Vars.tree.get(path, true).readString(); return Vars.tree.get(path, true).readString();
} }

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -241,7 +241,7 @@ public class HudFragment extends Fragment{
float[] coreAttackTime = {0}; float[] coreAttackTime = {0};
float[] coreAttackOpacity = {0}; float[] coreAttackOpacity = {0};
Events.on(Trigger.teamCoreDamage, () -> { Events.run(Trigger.teamCoreDamage, () -> {
coreAttackTime[0] = notifDuration; coreAttackTime[0] = notifDuration;
}); });

14
desktop/src/mindustry/desktop/steam/SStats.java
View File

@@ -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){ if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){
drop10kitems.complete(); 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); trigger(Trigger.impactPower, powerupImpactReactor);
@@ -167,9 +167,9 @@ public class SStats implements SteamUserStatsCallback{
trigger(Trigger.suicideBomb, suicideBomb); 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()){ if(campaign()){
SStat.reactorsOverheated.add(); SStat.reactorsOverheated.add();
} }
@@ -264,7 +264,7 @@ public class SStats implements SteamUserStatsCallback{
} }
private void trigger(Trigger trigger, SAchievement ach){ private void trigger(Trigger trigger, SAchievement ach){
Events.on(trigger, () -> { Events.run(trigger, () -> {
if(campaign()){ if(campaign()){
ach.complete(); ach.complete();
} }

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=67c4b5cb3c52f5267bbcb4ecfe7134676664c3c2 archash=37a42909cbc4b857437ca29a132edbe05db76989

4
server/src/mindustry/server/ServerControl.java
View File

@@ -161,7 +161,7 @@ public class ServerControl implements ApplicationListener{
}); });
//autosave periodically //autosave periodically
Events.on(Trigger.update, () -> { Events.run(Trigger.update, () -> {
if(state.isPlaying() && Config.autosave.bool()){ if(state.isPlaying() && Config.autosave.bool()){
if(autosaveCount.get(Config.autosaveSpacing.num() * 60)){ if(autosaveCount.get(Config.autosaveSpacing.num() * 60)){
int max = Config.autosaveAmount.num(); 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(false);
toggleSocket(Config.socketInput.bool()); toggleSocket(Config.socketInput.bool());
}); });

1
tools/src/mindustry/tools/ScriptStubGenerator.java
View File

@@ -41,6 +41,7 @@ public class ScriptStubGenerator{
classes.removeAll(type -> type.isSynthetic() || type.isAnonymousClass() || type.getCanonicalName() == null || Modifier.isPrivate(type.getModifiers()) 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())); || blacklist.contains(s -> type.getName().startsWith(base + "." + s + ".")) || nameBlacklist.contains(type.getSimpleName()));
classes.distinct(); classes.distinct();
classes.sortComparing(Class::getName);
ObjectSet<String> used = ObjectSet.with(); ObjectSet<String> used = ObjectSet.with();
StringBuilder result = new StringBuilder("//Generated class. Do not modify.\n"); StringBuilder result = new StringBuilder("//Generated class. Do not modify.\n");