From 4161698bb8d41e7b685f7ade090b616165fc7f32 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 4 May 2020 18:05:47 -0400 Subject: [PATCH] Removed quote requirement for events --- core/assets/scripts/base.js | 2 +- core/assets/scripts/global.js | 77 +++++++++++++++---- core/src/mindustry/mod/Mods.java | 2 +- gradle.properties | 2 +- .../mindustry/tools/ScriptStubGenerator.java | 7 +- 5 files changed, 72 insertions(+), 18 deletions(-) diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index 488ff67dac..f1e2a04b61 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -3,7 +3,7 @@ const log = function(context, obj){ } const onEvent = function(event, handler){ - Vars.mods.getScripts().onEvent(EventType[event], handler) + Vars.mods.getScripts().onEvent(event, handler) } var scriptName = "base.js" diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 71af1fbdaa..813f18a16c 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -5,7 +5,7 @@ const log = function(context, obj){ } const onEvent = function(event, handler){ - Vars.mods.getScripts().onEvent(EventType[event], handler) + Vars.mods.getScripts().onEvent(event, handler) } var scriptName = "base.js" @@ -30,51 +30,51 @@ importPackage(Packages.mindustry.entities) importPackage(Packages.mindustry.gen) importPackage(Packages.mindustry.core) importPackage(Packages.mindustry.world.blocks.storage) -importPackage(Packages.arc.scene.ui.layout) +importPackage(Packages.mindustry.ui.dialogs) importPackage(Packages.arc.scene.ui) -importPackage(Packages.mindustry.ai.formations.patterns) +importPackage(Packages.mindustry.world.blocks.defense.turrets) importPackage(Packages.mindustry.world.blocks.distribution) importPackage(Packages.mindustry.ui) importPackage(Packages.mindustry.content) importPackage(Packages.mindustry.world.blocks.liquid) importPackage(Packages.arc.struct) +importPackage(Packages.arc.scene.ui.layout) importPackage(Packages.mindustry.world.modules) importPackage(Packages.arc.util) -importPackage(Packages.mindustry.maps.generators) importPackage(Packages.arc.graphics) importPackage(Packages.mindustry.entities.def) +importPackage(Packages.mindustry.maps.generators) importPackage(Packages.arc.scene.actions) importPackage(Packages.mindustry.graphics) importPackage(Packages.mindustry.entities.bullet) -importPackage(Packages.mindustry.async) importPackage(Packages.mindustry.world.blocks.legacy) importPackage(Packages.mindustry.world.blocks.experimental) importPackage(Packages.mindustry.editor) -importPackage(Packages.mindustry.world.blocks.defense.turrets) importPackage(Packages.mindustry.world.blocks.power) -importPackage(Packages.mindustry.world.blocks.production) +importPackage(Packages.mindustry.ui.layout) importPackage(Packages.mindustry.world.blocks.sandbox) importPackage(Packages.mindustry.input) importPackage(Packages.mindustry.world.consumers) -importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.ui.fragments) importPackage(Packages.mindustry.ai.formations) importPackage(Packages.mindustry.type) +importPackage(Packages.mindustry.world.blocks.production) importPackage(Packages.arc.scene.event) -importPackage(Packages.mindustry.ui.fragments) -importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.arc.math) importPackage(Packages.arc.scene.utils) -importPackage(Packages.mindustry.ui.dialogs) +importPackage(Packages.mindustry.world.blocks.defense) importPackage(Packages.mindustry.graphics.g3d) importPackage(Packages.mindustry.world.meta) -importPackage(Packages.arc.math) importPackage(Packages.mindustry.world.blocks.payloads) importPackage(Packages.mindustry.world) +importPackage(Packages.mindustry.async) importPackage(Packages.arc.scene.style) importPackage(Packages.mindustry.world.blocks) importPackage(Packages.arc.math.geom) importPackage(Packages.mindustry.ai) importPackage(Packages.mindustry.maps.filters) importPackage(Packages.arc.graphics.g2d) +importPackage(Packages.mindustry.ai.formations.patterns) importPackage(Packages.mindustry.world.blocks.environment) importPackage(Packages.mindustry) importPackage(Packages.mindustry.entities.units) @@ -83,8 +83,57 @@ importPackage(Packages.mindustry.ai.types) importPackage(Packages.mindustry.maps) importPackage(Packages.mindustry.world.meta.values) importPackage(Packages.mindustry.world.producers) -importPackage(Packages.mindustry.ui.layout) +importPackage(Packages.mindustry.world.blocks.units) importPackage(Packages.arc.scene) importPackage(Packages.mindustry.maps.planet) -importPackage(Packages.mindustry.world.blocks.logic) importPackage(Packages.arc) +importPackage(Packages.mindustry.world.blocks.logic) +const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent +const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent +const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent +const PlayerBanEvent = Packages.mindustry.game.EventType.PlayerBanEvent +const PlayerLeave = Packages.mindustry.game.EventType.PlayerLeave +const PlayerConnect = Packages.mindustry.game.EventType.PlayerConnect +const PlayerJoin = Packages.mindustry.game.EventType.PlayerJoin +const MechChangeEvent = Packages.mindustry.game.EventType.MechChangeEvent +const ResizeEvent = Packages.mindustry.game.EventType.ResizeEvent +const UnitCreateEvent = Packages.mindustry.game.EventType.UnitCreateEvent +const UnitDestroyEvent = Packages.mindustry.game.EventType.UnitDestroyEvent +const BlockDestroyEvent = Packages.mindustry.game.EventType.BlockDestroyEvent +const BuildSelectEvent = Packages.mindustry.game.EventType.BuildSelectEvent +const BlockBuildEndEvent = Packages.mindustry.game.EventType.BlockBuildEndEvent +const BlockBuildBeginEvent = Packages.mindustry.game.EventType.BlockBuildBeginEvent +const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent +const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent +const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent +const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent +const WorldLoadEvent = Packages.mindustry.game.EventType.WorldLoadEvent +const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent +const TapConfigEvent = Packages.mindustry.game.EventType.TapConfigEvent +const TapEvent = Packages.mindustry.game.EventType.TapEvent +const DepositEvent = Packages.mindustry.game.EventType.DepositEvent +const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent +const BlockInfoEvent = Packages.mindustry.game.EventType.BlockInfoEvent +const CoreItemDeliverEvent = Packages.mindustry.game.EventType.CoreItemDeliverEvent +const TurretAmmoDeliverEvent = Packages.mindustry.game.EventType.TurretAmmoDeliverEvent +const LineConfirmEvent = Packages.mindustry.game.EventType.LineConfirmEvent +const WaveEvent = Packages.mindustry.game.EventType.WaveEvent +const ResetEvent = Packages.mindustry.game.EventType.ResetEvent +const PlayEvent = Packages.mindustry.game.EventType.PlayEvent +const DisposeEvent = Packages.mindustry.game.EventType.DisposeEvent +const ContentReloadEvent = Packages.mindustry.game.EventType.ContentReloadEvent +const ServerLoadEvent = Packages.mindustry.game.EventType.ServerLoadEvent +const ClientLoadEvent = Packages.mindustry.game.EventType.ClientLoadEvent +const ClientCreateEvent = Packages.mindustry.game.EventType.ClientCreateEvent +const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent +const ZoneConfigureCompleteEvent = Packages.mindustry.game.EventType.ZoneConfigureCompleteEvent +const ZoneRequireCompleteEvent = Packages.mindustry.game.EventType.ZoneRequireCompleteEvent +const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent +const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent +const MapPublishEvent = Packages.mindustry.game.EventType.MapPublishEvent +const MapMakeEvent = Packages.mindustry.game.EventType.MapMakeEvent +const LaunchItemEvent = Packages.mindustry.game.EventType.LaunchItemEvent +const LaunchEvent = Packages.mindustry.game.EventType.LaunchEvent +const LoseEvent = Packages.mindustry.game.EventType.LoseEvent +const WinEvent = Packages.mindustry.game.EventType.WinEvent +const Trigger = Packages.mindustry.game.EventType.Trigger diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 847957dec7..890ef076d3 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -374,7 +374,7 @@ public class Mods implements Loadable{ private void checkWarnings(){ //show 'scripts have errored' info if(scripts != null && scripts.hasErrored()){ - ui.showErrorMessage("$mod.scripts.unsupported"); + ui.showErrorMessage("$mod.scripts.disable"); } //show list of errored content diff --git a/gradle.properties b/gradle.properties index 97e109ee75..d08ca8d1a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=c3006b41f6c2f9f07d1004ab1d829040b6af561f +archash=9ad12d12fdd74d673f7c9b9d95f25d95ade114a5 diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index ddbd357e60..50426ec79f 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -9,6 +9,7 @@ import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; import arc.math.*; import arc.util.*; +import mindustry.game.*; import mindustry.gen.*; import org.reflections.*; import org.reflections.scanners.*; @@ -20,7 +21,7 @@ import java.util.*; public class ScriptStubGenerator{ - public static void main(String[] args){ + public static void main(String[] args) throws Exception{ String base = "mindustry"; Array blacklist = Array.with("plugin", "mod", "net", "io", "tools"); Array nameBlacklist = Array.with("ClassAccess"); @@ -63,6 +64,10 @@ public class ScriptStubGenerator{ used.add(type.getPackage().getName()); } + for(Class type : EventType.class.getClasses()){ + result.append("const ").append(type.getSimpleName()).append(" = ").append("Packages.").append(type.getName().replace('$', '.')).append("\n"); + } + //Log.info(result); new Fi("core/assets/scripts/global.js").writeString(result.toString());