Multiworld and JScripting Port

build.gradle

@@ -97,7 +97,7 @@ if (System.getenv("BUILD_NUMBER") != null) {
 }
 
 ext.set 'changelog', System.getenv("CHANGE_LOG")
-ext.set 'releaseType', 'alpha'
+ext.set 'releaseType', 'beta'
 
 // Get commit hash
 
@@ -357,7 +357,7 @@ sourceSets {
 // Configure utils tokens
 task processSource(type: Sync) {
     from sourceSets.utils.java
-    filter(ReplaceTokens, tokens: ['_MCVERSION_':project.minecraftVersion, '_BASEVERSION_': project.mod_base, '_MAJORVERSION_': project.mod_major])
+    filter(ReplaceTokens, tokens: ['_MCVERSION_':project.minecraftVersion, '_BASEVERSION_': project.mod_base, '_MAJORVERSION_': project.mod_major, '_RELEASETYPE_': project.releaseType])
     into "$buildDir/src"
 }
 
@@ -429,10 +429,10 @@ compileClientJava {
 
  // JavaExec task for generating tsd
 //  Calls the main class for the TSD generator since that is working
-/*
+
 task tsd(type: JavaExec) {
     dependsOn "classes"
-    classpath = project.sourceSets.test.compileClasspath
+    classpath = files(project.sourceSets.test.compileClasspath, project.sourceSets.main.compileClasspath)
     mainClass = "com.forgeessentials.jscripting.TsdGenerator"
     doLast {
         copy {
@@ -443,7 +443,7 @@ task tsd(type: JavaExec) {
             into "build/resources/main/com/forgeessentials/jscripting"
         }
     }
-}*/
+}
 
 /************************************************************
  * Configure client jar
@@ -498,7 +498,7 @@ jar {
 	duplicatesStrategy = DuplicatesStrategy.INCLUDE
 	dependsOn clientJar
 	dependsOn shadowJar
-    //dependsOn "tsd"
+    dependsOn "tsd"
     archiveClassifier = "server"
 	archiveAppendix = project.minecraftVersion
 

jscripting/fe.d.ts

@@ -33,55 +33,49 @@ declare namespace fe {
 	}
 
 	class CommandArgs extends Wrapper {
-		sender: mc.ICommandSender;
-		player: mc.entity.EntityPlayer;
+		sender: mc.CommandSource;
+		player: mc.entity.PlayerEntity;
 		ident: UserIdent;
-		isTabCompletion: boolean;
-		toArray(): string[];
-		toString(): string;
-		confirm(message: string, ...args: any[]): void;
-		notify(message: string, ...args: any[]): void;
-		warn(message: string, ...args: any[]): void;
-		error(message: string, ...args: any[]): void;
-		size(): int;
-		remove(): string;
-		peek(): string;
-		get(index: int): string;
-		getAllArgs(): string;
-		removeAllArgs(): string;
-		isEmpty(): boolean;
+		context: com.mojang.brigadier.context.CommandContext;
+		params: string;
 		hasPlayer(): boolean;
-		parsePlayer(): UserIdent;
-		parsePlayer(mustExist: boolean): UserIdent;
-		parsePlayer(mustExist: boolean, mustBeOnline: boolean): UserIdent;
-		parseItem(): mc.item.Item;
-		parseBlock(): mc.world.Block;
-		parsePermission(): string;
-		checkPermission(perm: string): void;
+		confirm(message: string, args: any[]): void;
+		notify(message: string, args: any[]): void;
+		warn(message: string, args: any[]): void;
+		error(message: string, args: any[]): void;
+		parsePlayer(name: string): UserIdent;
+		parsePlayer(name: string, mustExist: boolean): UserIdent;
+		parsePlayer(name: string, mustExist: boolean, mustBeOnline: boolean): UserIdent;
+		parseItem(argumentName: string): mc.item.Item;
+		parseBlock(argumentName: string): mc.world.Block;
+		parseWorld(argumentName: string): mc.world.ServerWorld;
 		hasPermission(perm: string): boolean;
-		tabComplete(...completionList: string[]): void;
-		tabCompleteWord(completion: string): void;
-		parseWorld(): mc.world.WorldServer;
-		parseInt(): int;
-		parseInt(min: int, max: int): int;
-		parseLong(): long;
-		parseDouble(): double;
-		parseBoolean(): boolean;
-		parseTimeReadable(): long;
-		checkTabCompletion(): void;
-		requirePlayer(): void;
+		parseTimeReadable(time: string): long;
 		getSenderPoint(): WorldPoint;
 		needsPlayer(): void;
-		clear(): void;
+		getArgumentBoolean(argumentName: string): boolean;
+		getArgumentDouble(argumentName: string): double;
+		getArgumentFloat(argumentName: string): float;
+		getArgumentInteger(argumentName: string): int;
+		getArgumentLong(argumentName: string): long;
+		getArgumentString(argumentName: string): string;
 	}
 
 	class CommandOptions {
 		name: string;
 		usage?: string;
-		permission?: string;
 		opOnly?: boolean;
+		executesMethod: boolean;
+		executionParams?: string;
+		/**
+		 * Don't EVER USE THIS! INTERNAL USE ONLY!
+		 */
+		listsSubNodes?: java.util.List;
+		/**
+		 * Don't implement this directly, instead use subNode[anyLetterNumber] (ex. subNode4, subNodeXYZ)
+		 */
+		subNode?: any;
 		processCommand: CommandCallback;
-		tabComplete?: CommandCallback;
 		constructor();
 	}
 
@@ -108,28 +102,15 @@ declare namespace fe {
 		/**
 		 * Adds a CoRoutine callback
 		 */
-		AddCoRoutine(count: int, tickStep: int, method: string, sender: mc.ICommandSender): void;
-		AddCoRoutine(count: int, tickStep: int, method: string, sender: mc.ICommandSender, extraData: any): void;
-		/**
-		 * Creates a custom inventory from an Itemstack list
-		 */
-		createCustomInventory(name: string, hasCustom: boolean, stacks: mc.item.ItemStack[]): mc.item.Inventory;
-		/**
-		 * Clones an existing inventory
-		 */
-		cloneInventory(name: string, hasCustom: boolean, inventory: mc.item.Inventory, size: int): mc.item.Inventory;
-		/**
-		 * Gets a Special Interaction Object that is designed to be used as a menu
-		 * WARNING: Do not close the screen during the callback. This causes a desync!
-		 */
-		getMenuChest(name: string, displayName: string, inventory: mc.item.Inventory, callbackMethod: string): mc.item.InteractionObject;
+		AddCoRoutine(count: int, tickStep: int, method: string, sender: mc.CommandSource): void;
+		AddCoRoutine(count: int, tickStep: int, method: string, sender: mc.CommandSource, extraData: any): void;
 	}
 
 	class Permissions {
 		static checkBooleanPermission(permissionValue: string): boolean;
 		static getPermission(ident: UserIdent, point: WorldPoint, area: WorldArea, groups: string[], permissionNode: string, isProperty: boolean): string;
-		static checkPermission(player: mc.entity.EntityPlayer, permissionNode: string): boolean;
-		static getPermissionProperty(player: mc.entity.EntityPlayer, permissionNode: string): string;
+		static checkPermission(player: mc.entity.PlayerEntity, permissionNode: string): boolean;
+		static getPermissionProperty(player: mc.entity.PlayerEntity, permissionNode: string): string;
 		static registerPermissionDescription(permissionNode: string, description: string): void;
 		static getPermissionDescription(permissionNode: string): string;
 		static registerPermission(permissionNode: string, level: net.minecraftforge.server.permission.DefaultPermissionLevel, description: string): void;
@@ -192,14 +173,12 @@ declare namespace fe {
 		setWandEnabled(wandEnabled: boolean): void;
 		getWandID(): string;
 		setWandID(wandID: string): void;
-		getWandDmg(): int;
-		setWandDmg(wandDmg: int): void;
 		getSel1(): Point;
 		getSel2(): Point;
-		getSelDim(): int;
+		getSelDim(): string;
 		setSel1(point: Point): void;
 		setSel2(point: Point): void;
-		setSelDim(dimension: int): void;
+		setSelDim(dimension: string): void;
 		getLastTeleportOrigin(): WarpPoint;
 		setLastTeleportOrigin(lastTeleportStart: WarpPoint): void;
 		getLastDeathLocation(): WarpPoint;
@@ -233,7 +212,7 @@ declare namespace fe {
 		createGroup(name: string): boolean;
 		getZonesAt(worldPoint: WorldPoint): java.util.List;
 		getZoneAt(worldPoint: WorldPoint): Zone;
-		getPlayerGroups(player: mc.entity.EntityPlayer): java.util.List;
+		getPlayerGroups(player: mc.entity.PlayerEntity): java.util.List;
 		addZone(zoneName: string, area: WorldArea): Zone;
 		removeZone(zone: Zone): void;
 	}
@@ -248,9 +227,9 @@ declare namespace fe {
 		getUuid(): java.util.UUID;
 		getUsername(): string;
 		getUsernameOrUuid(): string;
-		getPlayer(): mc.entity.EntityPlayer;
-		getFakePlayer(): mc.entity.EntityPlayer;
-		getFakePlayer(world: mc.world.WorldServer): mc.entity.EntityPlayer;
+		getPlayer(): mc.entity.PlayerEntity;
+		getFakePlayer(): mc.entity.PlayerEntity;
+		getFakePlayer(world: mc.world.ServerWorld): mc.entity.PlayerEntity;
 		toSerializeString(): string;
 		toString(): string;
 		hashCode(): int;
@@ -277,11 +256,11 @@ declare namespace fe {
 		getX(): double;
 		getY(): double;
 		getZ(): double;
-		getDimension(): int;
+		getDimension(): string;
 		getPitch(): float;
 		getYaw(): float;
-		set(dim: int, xd: double, yd: double, zd: double, pitch: float, yaw: float): void;
-		setDimension(dim: int): void;
+		set(dim: string, xd: double, yd: double, zd: double, pitch: float, yaw: float): void;
+		setDimension(dim: string): void;
 		setX(value: double): void;
 		setY(value: double): void;
 		setZ(value: double): void;
@@ -295,14 +274,14 @@ declare namespace fe {
 	}
 
 	class WorldArea extends mc.AreaBase {
-		constructor(dim: int, p1: Point, p2: Point);
-		getDimension(): int;
+		constructor(dim: string, p1: Point, p2: Point);
+		getDimension(): string;
 	}
 
 	class WorldPoint extends Point {
-		constructor(dim: int, x: int, y: int, z: int);
-		getDimension(): int;
-		setDimension(dim: int): void;
+		constructor(dim: string, x: int, y: int, z: int);
+		getDimension(): string;
+		setDimension(dim: string): void;
 		setX(x: int): WorldPoint;
 		setY(y: int): WorldPoint;
 		setZ(z: int): WorldPoint;
@@ -311,7 +290,7 @@ declare namespace fe {
 	class Zone extends Wrapper {
 		getId(): int;
 		getName(): string;
-		isPlayerInZone(player: mc.entity.EntityPlayer): boolean;
+		isPlayerInZone(player: mc.entity.PlayerEntity): boolean;
 		isInZone(point: WorldPoint): boolean;
 		isInZone(point: WorldArea): boolean;
 		isPartOfZone(point: WorldArea): boolean;
@@ -321,6 +300,60 @@ declare namespace fe {
 
 }
 
+declare namespace fe.command {
+
+	class ArgumentType extends java.lang.Enum {
+		static BOOLEAN: ArgumentType;
+		static DOUBLE: ArgumentType;
+		static FLOAT: ArgumentType;
+		static INTEGER: ArgumentType;
+		static LONG: ArgumentType;
+		static STRINGWORD: ArgumentType;
+		static STRINGQUOTE: ArgumentType;
+		static STRINGGREEDY: ArgumentType;
+		static values(): ArgumentType[];
+		static valueOf(name: string): ArgumentType;
+		static getType(type: ArgumentType): com.mojang.brigadier.arguments.ArgumentType;
+	}
+
+	class CommandNodeArgument {
+		executesMethod: boolean;
+		executionParams?: string;
+		argumentName: string;
+		argumentType: JsArgumentType;
+		constructor();
+	}
+
+	class CommandNodeLiteral {
+		executesMethod: boolean;
+		executionParams?: string;
+		literal: string;
+		constructor();
+	}
+
+	class CommandNodeWrapper {
+		/**
+		 * Don't EVER USE THIS! INTERNAL USE ONLY!
+		 */
+		listsChildNodes?: java.util.List;
+		/**
+		 * Don't implement this directly, instead use childNode[anyLetterNumber] (ex. childNode4, childNodeXYZ)
+		 */
+		childNode?: any;
+		type: JsNodeType;
+		containedNode: JsCommandNodeLiteral/JsCommandNodeArgument;
+		constructor();
+	}
+
+	class NodeType extends java.lang.Enum {
+		static LITERAL: NodeType;
+		static ARGUMENT: NodeType;
+		static values(): NodeType[];
+		static valueOf(name: string): NodeType;
+	}
+
+}
+
 declare namespace fe.event.entity.player {
 
 	class FEPlayerEvent extends mc.event.entity.player.PlayerEvent {