diff --git a/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java b/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java index 080ed28..e7ea08b 100644 --- a/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java +++ b/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java @@ -74,14 +74,6 @@ public class ScriptCraftPlugin extends Plugin implements PluginListener, Command } }; } - public CraftingRecipe makeShapedRecipe(Item resultingItem, RecipeRow... rows){ - CraftingRecipe result = new CraftingRecipe(resultingItem, rows); - return result; - } - public CraftingRecipe makeShapelessRecipe(Item resultingItem, Item... items){ - CraftingRecipe result = new CraftingRecipe(resultingItem, items); - return result; - } static class ScriptCraftTask extends ServerTask { private Runnable runnable = null; public ScriptCraftTask(Runnable runnable, TaskOwner owner, long delay, boolean continuous){ diff --git a/src/main/js/modules/canary/recipes.js b/src/main/js/modules/canary/recipes.js index ccab968..7d63375 100644 --- a/src/main/js/modules/canary/recipes.js +++ b/src/main/js/modules/canary/recipes.js @@ -26,9 +26,9 @@ function createRecipe( recipe ){ } rows.push( new cmRecipeRow(recipe.shape[i], rr) ); } - result = __plugin.makeShapedRecipe( recipe.result, rows); + result = cmRecipe.createShapedRecipe( recipe.result, rows); } else { - result = __plugin.makeShapelessRecipe( recipe.result, recipe.ingredients ); + result = cmRecipe.createShapelessRecipe( recipe.result, recipe.ingredients ); } return result; } diff --git a/src/main/js/modules/recipes.js b/src/main/js/modules/recipes.js index 821410c..ccefbb4 100644 --- a/src/main/js/modules/recipes.js +++ b/src/main/js/modules/recipes.js @@ -10,7 +10,7 @@ To add an EnderBow to the game (assumes there's an enchanted Item variable calle var recipes = require('recipes'); var items = require('items'); ... - var enderBowRecipe = recipes.add( { + var enderBowRecipe = recipes.create( { result: enderBow, ingredients: { E: items.enderPearl(1), @@ -21,8 +21,10 @@ To add an EnderBow to the game (assumes there's an enchanted Item variable calle 'SEW', 'ESW' ] } ); + // add to server + var addedRecipe = server.addRecipe( enderBowRecipe ); // to remove... - recipes.remove( enderBowRecipe ); + server.removeRemove( addedRecipe ); ***/ if (__plugin.canary) {