geforkt von Mirrors/Paper
90ac03522a
This reverts commit d6e3dff7d8
.
78 Zeilen
2.3 KiB
Diff
78 Zeilen
2.3 KiB
Diff
--- ../work/decompile-8eb82bde//net/minecraft/server/ShapedRecipes.java 2014-11-28 17:43:43.373707429 +0000
|
|
+++ src/main/java/net/minecraft/server/ShapedRecipes.java 2014-11-28 17:38:18.000000000 +0000
|
|
@@ -1,5 +1,11 @@
|
|
package net.minecraft.server;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.craftbukkit.inventory.CraftShapedRecipe;
|
|
+// CraftBukkit end
|
|
+
|
|
+
|
|
public class ShapedRecipes implements IRecipe {
|
|
|
|
private final int width;
|
|
@@ -14,6 +20,62 @@
|
|
this.items = aitemstack;
|
|
this.result = itemstack;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ public org.bukkit.inventory.ShapedRecipe toBukkitRecipe() {
|
|
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
|
|
+ CraftShapedRecipe recipe = new CraftShapedRecipe(result, this);
|
|
+ switch (this.height) {
|
|
+ case 1:
|
|
+ switch (this.width) {
|
|
+ case 1:
|
|
+ recipe.shape("a");
|
|
+ break;
|
|
+ case 2:
|
|
+ recipe.shape("ab");
|
|
+ break;
|
|
+ case 3:
|
|
+ recipe.shape("abc");
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
+ case 2:
|
|
+ switch (this.width) {
|
|
+ case 1:
|
|
+ recipe.shape("a","b");
|
|
+ break;
|
|
+ case 2:
|
|
+ recipe.shape("ab","cd");
|
|
+ break;
|
|
+ case 3:
|
|
+ recipe.shape("abc","def");
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ switch (this.width) {
|
|
+ case 1:
|
|
+ recipe.shape("a","b","c");
|
|
+ break;
|
|
+ case 2:
|
|
+ recipe.shape("ab","cd","ef");
|
|
+ break;
|
|
+ case 3:
|
|
+ recipe.shape("abc","def","ghi");
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ char c = 'a';
|
|
+ for (ItemStack stack : this.items) {
|
|
+ if (stack != null) {
|
|
+ recipe.setIngredient(c, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData());
|
|
+ }
|
|
+ c++;
|
|
+ }
|
|
+ return recipe;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
public ItemStack b() {
|
|
return this.result;
|