Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build/scripts/commands/general.js
#	build/scripts/index.js
#	build/scripts/translation.js
#	src/translation.ts

Author: TheRadioactiveBanana

build/scripts/commands/general.js

@@ -63,6 +63,26 @@ class ObjectIntMap<K> {
 		});
 	}
 }
+class ObjectSet<T> {
+	set = new Set<T>();
+	get size(){ return this.set.size; }
+	select(predicate:(item:T) => boolean){
+		const out = new ObjectSet<T>;
+		for(const item of this.set){
+			if(predicate(item)) out.add(item);
+		}
+		return out;
+	}
+	each(func:(item:T) => unknown){ this.set.forEach(func); }
+	add(item:T){ return this.set.add(item); }
+	remove(item:T){ return this.set.delete(item); }
+	isEmpty(){ return this.set.size == 0; }
+	contains(item:T){ return this.set.has(item); }
+	toSeq(){ return new Seq([...this.set]); }
+	get(key:T){ return this.set.has(key) ? key : null; }
+	first(){ return this.set.values().next().value ?? fail("Set is empty"); }
+	clear(){ this.set.clear(); }
+}
 
 class Seq<T> {
 	constructor(public items:T[] = []){}
@@ -471,6 +491,9 @@ class LabelReliableCallPacket {
 	worldx = 0;
 	worldy = 0;
 }
+class SendChatMessageCallPacket {
+	message:string | null = null;
+}
 class CommandRunner<T> {
 	accept: (args:string[], parameter: T) => void;
 	constructor({ accept }:{ accept: (args:string[], parameter: T) => void; }){
@@ -621,6 +644,9 @@ class Administration {
 	getInfoOptional(id:string){
 		return this.playerInfo.get(id);
 	}
+	static Config = class {
+
+	};
 }
 class MMap {
 
@@ -646,6 +672,7 @@ const Vars = {
 	},
 	net: {
 		send(object:any, reliable:boolean){},
+		handleServer(packetType:Function, handler:any){}
 	},
 	mods: {
 		getScripts(){
@@ -959,6 +986,14 @@ class Thread {
 	run = this.runnable;
 }
 
+const Http = {
+	post(url:string, content:string){
+		return { submit(){}, block(){}, error(){}, header(){return this;}, };
+	},
+	get(url:string, callback?:(res:HttpResponse) => unknown, error?:(err:any) => unknown){
+		return { submit(){}, block(){}, error(){}, header(){return this;}, };
+	},
+};
 
 const Iconc = Object.fromEntries(["rotate", "modeSurvival", "power", "left", "redditAlien", "edit", "downOpen", "pencil", "file", "lockOpen", "right", "infoCircle", "pick", "settings", "spray1", "terrain", "exit", "wrench", "lock", "discord", "eye", "none", "play", "diagonal", "eraser", "trash", "liquid", "fileImage", "defense", "layers", "grid", "admin", "steam", "star", "chartBar", "chat", "android", "image", "map", "logic", "menu", "commandRally", "editor", "folder", "units", "commandAttack", "copy", "filter", "cancel", "terminal", "upload", "eyeOff", "save", "planeOutline", "fill", "distribution", "upOpen", "rightOpen", "modePvp", "download", "list", "flipX", "flipY", "effect", "paste", "planet", "waves", "up", "warning", "tree", "add", "down", "host", "spray", "info", "players", "resize", "refresh1", "production", "crafting", "pause", "googleplay", "hammer", "fileText", "modeAttack", "move", "zoom", "bookOpen", "refresh", "ok", "home", "githubSquare", "powerOld", "github", "undo", "box", "trello", "book", "export", "fileTextFill", "rightOpenOut", "turret", "leftOpen", "line", "itchio", "link", "filters", "redo"].map(n => [n, 0xFE60]));
 
@@ -974,4 +1009,4 @@ const Packages = {
 		gen: { Map: MMap }
 	}
 };
-Object.assign(globalThis, {Pattern, ObjectIntMap, Seq, Fi, Packages, Events, Trigger, Team, EventType, Timer, EffectCallPacket2, LabelReliableCallPacket, Vars, ServerControl, Core, Log, Menus, Time, CommandHandler, Gamemode, Fx, Effect, Vec2, Tmp, Paths, Path, Threads, CommandRunner, Strings, UnitTypes, Bits, Items, ItemStack, Iconc, Blocks, StatusEffects, Ratekeeper, Runtime, Thread});
+Object.assign(globalThis, {Pattern, ObjectIntMap, Seq, Fi, Packages, Events, Trigger, Team, EventType, Timer, EffectCallPacket2, LabelReliableCallPacket, Vars, ServerControl, Core, Log, Menus, Time, CommandHandler, Gamemode, Fx, Effect, Vec2, Tmp, Paths, Path, Threads, CommandRunner, Strings, UnitTypes, Bits, Items, ItemStack, Iconc, Blocks, StatusEffects, Ratekeeper, Runtime, Thread, Administration, ObjectSet, ObjectMap, SendChatMessageCallPacket, Http});

build/scripts/index.js

@@ -157,7 +157,7 @@ Vars.net.handleServer(SendChatMessageCallPacket, (connection: NetConnection, pac
 
 		if (filtered == null) return;
 
-		translation.messageHandoff(player, message);
+		translation.handleMessage(player, message);
 	}else if (response.type != CommandHandler.ResponseType.valid){
 		const text = Vars.netServer.invalidHandler.handle(player, response);
 

build/scripts/translation.js

@@ -75,9 +75,9 @@ const Vars: {
 		votesRequired():number;
 	}
 	net: {
-		send(object:any, reliable:boolean):void;
+		send(packet:any, reliable:boolean):void;
 		closeServer():void;
-		handleServer(object: any, handler:(object: any, connection: NetConnection) => void): void
+		handleServer(packetType: new (...args:any[]) => unknown, handler:(packet: any, connection: NetConnection) => void): void;
 	}
 	mods: {
 		getScripts(): Scripts;
@@ -464,6 +464,11 @@ const Time: {
 const GameState: {
 	State: Record<"playing" | "paused" | "menu", any>;
 };
+const Http: {
+	post(url:string, content:string):HttpRequest;
+	get(url:string):HttpRequest;
+	get(url:string, callback:(res:HttpResponse) => unknown, error:(err:any) => unknown):void;
+};
 class HttpRequest {
 	submit(func:(response:HttpResponse) => void):void;
 	block(func:(response:HttpResponse) => void):void;
@@ -531,11 +536,7 @@ class ByteArrayOutputStream extends OutputStream {
 class ByteArrayInputStream extends InputStream {
 	constructor(bytes:number[]);
 }
-const Http: {
-	post(url:string, content:string):HttpRequest;
-	get(url:string):HttpRequest;
-	get(url:string, callback:(res:HttpResponse) => unknown, error:(err:any) => unknown):void;
-};
+
 class Seq<T> {
 	items: Array<T | null>;
 	size: number;
@@ -580,6 +581,7 @@ class ObjectSet<T> {
 	select(predicate:(item:T) => boolean):ObjectSet<T>;
 	each(func:(item:T) => unknown):void;
 	add(item:T):boolean;
+	addAll(items:T[]):void;
 	remove(item:T):boolean;
 	isEmpty():boolean;
 	contains(item:T):boolean;