diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 28b4b83e38..72162e3c6a 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -124,14 +124,14 @@ const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent const BuildinghangeEvent = Packages.mindustry.game.EventType.BuildinghangeEvent const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent -const TapConfigEvent = Packages.mindustry.game.EventType.TapConfigEvent -const TapEvent = Packages.mindustry.game.EventType.TapEvent +const ConfigEvent = Packages.mindustry.game.EventType.ConfigEvent const DepositEvent = Packages.mindustry.game.EventType.DepositEvent const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent const SectorCaptureEvent = Packages.mindustry.game.EventType.SectorCaptureEvent const ZoneConfigureCompleteEvent = Packages.mindustry.game.EventType.ZoneConfigureCompleteEvent const ZoneRequireCompleteEvent = Packages.mindustry.game.EventType.ZoneRequireCompleteEvent const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent +const ClientPreConnectEvent = Packages.mindustry.game.EventType.ClientPreConnectEvent const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent const LaunchItemEvent = Packages.mindustry.game.EventType.LaunchItemEvent const SectorLoseEvent = Packages.mindustry.game.EventType.SectorLoseEvent diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index 575b2e5c61..03c45d6f95 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -166,13 +166,13 @@ public class EventType{ } } - /** Called when the player sets a specific block. */ - public static class TapConfigEvent{ + /** Called when the configures sets a specific block. */ + public static class ConfigEvent{ public final Building tile; public final Player player; public final Object value; - public TapConfigEvent(Building tile, Player player, Object value){ + public ConfigEvent(Building tile, Player player, Object value){ this.tile = tile; this.player = player; this.value = value; diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 476d335fd6..3fb7d31065 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -212,7 +212,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ if(net.server() && (!Units.canInteract(player, tile) || !netServer.admins.allowAction(player, ActionType.configure, tile.tile(), action -> action.config = value))) throw new ValidateException(player, "Player cannot configure a tile."); tile.configured(player, value); - Core.app.post(() -> Events.fire(new TapConfigEvent(tile, player, value))); + Core.app.post(() -> Events.fire(new ConfigEvent(tile, player, value))); } @Remote(targets = Loc.both, called = Loc.both, forward = true)