From 61f56612d8cd504f4bb6c31aecfa2354ae94757b Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Wed, 6 Jan 2016 17:31:51 +0100 Subject: [PATCH 1/8] Add vec3 typings --- vec3/vec3.d.ts | 29 +++++++++++++++++++++++++++++ vec3/vec3.ts | 3 +++ 2 files changed, 32 insertions(+) create mode 100644 vec3/vec3.d.ts create mode 100644 vec3/vec3.ts diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts new file mode 100644 index 000000000..39e573d9b --- /dev/null +++ b/vec3/vec3.d.ts @@ -0,0 +1,29 @@ +declare module "vec3"{ + export class Vec3{ + constructor(x: number, y: number, z: number); + constructor(location: number[]); + constructor(location: {x: number; y: number; z: number}); + constructor(locationStr: string); + + set(x, y, z): Vec3; + update(other: Vec3): Vec3; + floored(): Vec3; + floor(): Vec3; + offset(dx: number, dy: number, dz: number): Vec3; + translate(dx: number, dy: number, dz: number): Vec3; + add(other: Vec3): Vec3; + substract(other: Vec3): Vec3; + plus(other: Vec3): Vec3; + minus(other: Vec3): Vec3; + scaled(scalar: number): Vec3; + abs(): Vec3 + volume(): number; + modulus(): Vec3; + distanceTo(other: Vec3): number; + equals(other: Vec3): boolean; + toString(): string; + clone(): Vec3; + min(other: Vec3): Vec3; + max(other: Vec3): Vec3; + } +} \ No newline at end of file diff --git a/vec3/vec3.ts b/vec3/vec3.ts new file mode 100644 index 000000000..2bc383607 --- /dev/null +++ b/vec3/vec3.ts @@ -0,0 +1,3 @@ +/// +import * as vec3 from "vec3" +let myVector = new vec3.Vec3(10, 10, 10); \ No newline at end of file From 0d5bd9bd25c4fa0a81883e3bab4703420f8969de Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Wed, 6 Jan 2016 17:36:04 +0100 Subject: [PATCH 2/8] Fix name --- vec3/{vec3.ts => vec3-tests.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename vec3/{vec3.ts => vec3-tests.ts} (100%) diff --git a/vec3/vec3.ts b/vec3/vec3-tests.ts similarity index 100% rename from vec3/vec3.ts rename to vec3/vec3-tests.ts From c165b20f4f29b3f389a40d7e9423b80c826bac09 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Wed, 6 Jan 2016 17:43:26 +0100 Subject: [PATCH 3/8] try fix --- vec3/vec3-tests.ts | 3 +-- vec3/vec3.d.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/vec3/vec3-tests.ts b/vec3/vec3-tests.ts index 2bc383607..4395f47be 100644 --- a/vec3/vec3-tests.ts +++ b/vec3/vec3-tests.ts @@ -1,3 +1,2 @@ -/// import * as vec3 from "vec3" -let myVector = new vec3.Vec3(10, 10, 10); \ No newline at end of file +let myVector: vec3.Vec3 = new vec3.Vec3(10, 10, 10); \ No newline at end of file diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts index 39e573d9b..fff42c4b2 100644 --- a/vec3/vec3.d.ts +++ b/vec3/vec3.d.ts @@ -1,5 +1,5 @@ declare module "vec3"{ - export class Vec3{ + class Vec3{ constructor(x: number, y: number, z: number); constructor(location: number[]); constructor(location: {x: number; y: number; z: number}); From 6dbdbbe4aa4ddf5608745ad61a87e51ad7383183 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Wed, 6 Jan 2016 17:44:52 +0100 Subject: [PATCH 4/8] add header --- vec3/vec3.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts index fff42c4b2..30e8a0458 100644 --- a/vec3/vec3.d.ts +++ b/vec3/vec3.d.ts @@ -1,3 +1,8 @@ +// Type definitions for Vec3 Librairy +// Project: https://www.npmjs.com/package/vec3 +// Definitions by: Xavier Stouder +// Definitions: https://github.com/borisyankov/DefinitelyTyped + declare module "vec3"{ class Vec3{ constructor(x: number, y: number, z: number); From e9f89b9659014fbb1680249cd959384fa5ec2f1a Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Fri, 8 Jan 2016 14:01:17 +0100 Subject: [PATCH 5/8] fix implicit typing --- vec3/vec3.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts index 30e8a0458..29bac0c56 100644 --- a/vec3/vec3.d.ts +++ b/vec3/vec3.d.ts @@ -3,14 +3,14 @@ // Definitions by: Xavier Stouder // Definitions: https://github.com/borisyankov/DefinitelyTyped -declare module "vec3"{ - class Vec3{ +declare module "vec3" { + class Vec3 { constructor(x: number, y: number, z: number); constructor(location: number[]); constructor(location: {x: number; y: number; z: number}); constructor(locationStr: string); - set(x, y, z): Vec3; + set(x: number, y: number, z: number): Vec3; update(other: Vec3): Vec3; floored(): Vec3; floor(): Vec3; From 1b27a84c361c0522b9b448e98099cefd03b67b14 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Fri, 8 Jan 2016 16:19:18 +0100 Subject: [PATCH 6/8] Try to fix... --- vec3/vec3-tests.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vec3/vec3-tests.ts b/vec3/vec3-tests.ts index 4395f47be..8196b9d93 100644 --- a/vec3/vec3-tests.ts +++ b/vec3/vec3-tests.ts @@ -1,2 +1,5 @@ -import * as vec3 from "vec3" -let myVector: vec3.Vec3 = new vec3.Vec3(10, 10, 10); \ No newline at end of file +/// + +import {Vec3} from "vec3"; +let myVector: Vec3 = new Vec3(10, 10, 10); +console.log(myVector.toString()); \ No newline at end of file From f757b992b0cd7aee6bc30d7038aac98b60d240bc Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Fri, 8 Jan 2016 17:49:03 +0100 Subject: [PATCH 7/8] Prismarine Recipe --- prismarine-recipe/prismarine-recipe-tests.ts | 3 ++ .../typings/prismarine-recipe.d.ts | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 prismarine-recipe/prismarine-recipe-tests.ts create mode 100644 prismarine-recipe/typings/prismarine-recipe.d.ts diff --git a/prismarine-recipe/prismarine-recipe-tests.ts b/prismarine-recipe/prismarine-recipe-tests.ts new file mode 100644 index 000000000..d4da5ae39 --- /dev/null +++ b/prismarine-recipe/prismarine-recipe-tests.ts @@ -0,0 +1,3 @@ +import * as prismarineRecipe from "prismarine-recipe"; +let Recipe = prismarineRecipe("1.8").Recipe; +console.log(JSON.stringify(Recipe.find(5)[0], null, 2)); \ No newline at end of file diff --git a/prismarine-recipe/typings/prismarine-recipe.d.ts b/prismarine-recipe/typings/prismarine-recipe.d.ts new file mode 100644 index 000000000..2b414ddfe --- /dev/null +++ b/prismarine-recipe/typings/prismarine-recipe.d.ts @@ -0,0 +1,32 @@ +declare module "prismarine-recipe"{ + function prismarineRecipe(version: string): prismarineRecipe.MCRecipeVersion; + + module prismarineRecipe{ + interface Recipe{ + result: RecipeItem; + inShape: RecipeItem[][]; + outShape: RecipeItem[][]; + ingredients: RecipeItem[]; + requiresTable: boolean; + delta: RecipeItem; + } + interface RecipeStatic{ + find(itemType: number, metadata?: number): Recipe[]; + } + interface MCRecipeVersion{ + Recipe: RecipeStatic; + RecipeItem: RecipeItemStatic; + } + interface RecipeItem{ + id: number; + metadata: number; + count?: number; + } + interface RecipeItemStatic{ + fromEnum(itemFromRecipeEnum: number[] | number | RecipeItem): RecipeItem; + clone(recipeItem: RecipeItem): RecipeItem; + } + } + + export = prismarineRecipe; +} From 92563f5296c6f5171286ed0129252fa46f0b5cdb Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Fri, 8 Jan 2016 17:50:07 +0100 Subject: [PATCH 8/8] Revert "Prismarine Recipe" This reverts commit f757b992b0cd7aee6bc30d7038aac98b60d240bc. --- prismarine-recipe/prismarine-recipe-tests.ts | 3 -- .../typings/prismarine-recipe.d.ts | 32 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 prismarine-recipe/prismarine-recipe-tests.ts delete mode 100644 prismarine-recipe/typings/prismarine-recipe.d.ts diff --git a/prismarine-recipe/prismarine-recipe-tests.ts b/prismarine-recipe/prismarine-recipe-tests.ts deleted file mode 100644 index d4da5ae39..000000000 --- a/prismarine-recipe/prismarine-recipe-tests.ts +++ /dev/null @@ -1,3 +0,0 @@ -import * as prismarineRecipe from "prismarine-recipe"; -let Recipe = prismarineRecipe("1.8").Recipe; -console.log(JSON.stringify(Recipe.find(5)[0], null, 2)); \ No newline at end of file diff --git a/prismarine-recipe/typings/prismarine-recipe.d.ts b/prismarine-recipe/typings/prismarine-recipe.d.ts deleted file mode 100644 index 2b414ddfe..000000000 --- a/prismarine-recipe/typings/prismarine-recipe.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -declare module "prismarine-recipe"{ - function prismarineRecipe(version: string): prismarineRecipe.MCRecipeVersion; - - module prismarineRecipe{ - interface Recipe{ - result: RecipeItem; - inShape: RecipeItem[][]; - outShape: RecipeItem[][]; - ingredients: RecipeItem[]; - requiresTable: boolean; - delta: RecipeItem; - } - interface RecipeStatic{ - find(itemType: number, metadata?: number): Recipe[]; - } - interface MCRecipeVersion{ - Recipe: RecipeStatic; - RecipeItem: RecipeItemStatic; - } - interface RecipeItem{ - id: number; - metadata: number; - count?: number; - } - interface RecipeItemStatic{ - fromEnum(itemFromRecipeEnum: number[] | number | RecipeItem): RecipeItem; - clone(recipeItem: RecipeItem): RecipeItem; - } - } - - export = prismarineRecipe; -}