Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.2

Browse Source
This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/main/java/net/minecraft/server/RecipesFurnace.java
View File

@@ -1,7 +1,9 @@
package net.minecraft.server;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
public class RecipesFurnace {
@@ -9,47 +11,94 @@ public class RecipesFurnace {
public Map recipes = new HashMap(); // CraftBukkit - private -> public
private Map c = new HashMap();
public static final RecipesFurnace getInstance() {
public static RecipesFurnace getInstance() {
return a;
}
public RecipesFurnace() { // CraftBukkit - private -> public
this.registerRecipe(Block.IRON_ORE.id, new ItemStack(Item.IRON_INGOT), 0.7F);
this.registerRecipe(Block.GOLD_ORE.id, new ItemStack(Item.GOLD_INGOT), 1.0F);
this.registerRecipe(Block.DIAMOND_ORE.id, new ItemStack(Item.DIAMOND), 1.0F);
this.registerRecipe(Block.SAND.id, new ItemStack(Block.GLASS), 0.1F);
this.registerRecipe(Item.PORK.id, new ItemStack(Item.GRILLED_PORK), 0.35F);
this.registerRecipe(Item.RAW_BEEF.id, new ItemStack(Item.COOKED_BEEF), 0.35F);
this.registerRecipe(Item.RAW_CHICKEN.id, new ItemStack(Item.COOKED_CHICKEN), 0.35F);
this.registerRecipe(Item.RAW_FISH.id, new ItemStack(Item.COOKED_FISH), 0.35F);
this.registerRecipe(Block.COBBLESTONE.id, new ItemStack(Block.STONE), 0.1F);
this.registerRecipe(Item.CLAY_BALL.id, new ItemStack(Item.CLAY_BRICK), 0.3F);
this.registerRecipe(Block.CLAY.id, new ItemStack(Block.HARDENED_CLAY), 0.35F);
this.registerRecipe(Block.CACTUS.id, new ItemStack(Item.INK_SACK, 1, 2), 0.2F);
this.registerRecipe(Block.LOG.id, new ItemStack(Item.COAL, 1, 1), 0.15F);
this.registerRecipe(Block.EMERALD_ORE.id, new ItemStack(Item.EMERALD), 1.0F);
this.registerRecipe(Item.POTATO.id, new ItemStack(Item.POTATO_BAKED), 0.35F);
this.registerRecipe(Block.NETHERRACK.id, new ItemStack(Item.NETHER_BRICK), 0.1F);
this.registerRecipe(Block.COAL_ORE.id, new ItemStack(Item.COAL), 0.1F);
this.registerRecipe(Block.REDSTONE_ORE.id, new ItemStack(Item.REDSTONE), 0.7F);
this.registerRecipe(Block.LAPIS_ORE.id, new ItemStack(Item.INK_SACK, 1, 4), 0.2F);
this.registerRecipe(Block.QUARTZ_ORE.id, new ItemStack(Item.QUARTZ), 0.2F);
this.registerRecipe(Blocks.IRON_ORE, new ItemStack(Items.IRON_INGOT), 0.7F);
this.registerRecipe(Blocks.GOLD_ORE, new ItemStack(Items.GOLD_INGOT), 1.0F);
this.registerRecipe(Blocks.DIAMOND_ORE, new ItemStack(Items.DIAMOND), 1.0F);
this.registerRecipe(Blocks.SAND, new ItemStack(Blocks.GLASS), 0.1F);
this.a(Items.PORK, new ItemStack(Items.GRILLED_PORK), 0.35F);
this.a(Items.RAW_BEEF, new ItemStack(Items.COOKED_BEEF), 0.35F);
this.a(Items.RAW_CHICKEN, new ItemStack(Items.COOKED_CHICKEN), 0.35F);
this.registerRecipe(Blocks.COBBLESTONE, new ItemStack(Blocks.STONE), 0.1F);
this.a(Items.CLAY_BALL, new ItemStack(Items.CLAY_BRICK), 0.3F);
this.registerRecipe(Blocks.CLAY, new ItemStack(Blocks.HARDENED_CLAY), 0.35F);
this.registerRecipe(Blocks.CACTUS, new ItemStack(Items.INK_SACK, 1, 2), 0.2F);
this.registerRecipe(Blocks.LOG, new ItemStack(Items.COAL, 1, 1), 0.15F);
this.registerRecipe(Blocks.LOG2, new ItemStack(Items.COAL, 1, 1), 0.15F);
this.registerRecipe(Blocks.EMERALD_ORE, new ItemStack(Items.EMERALD), 1.0F);
this.a(Items.POTATO, new ItemStack(Items.POTATO_BAKED), 0.35F);
this.registerRecipe(Blocks.NETHERRACK, new ItemStack(Items.NETHER_BRICK), 0.1F);
EnumFish[] aenumfish = EnumFish.values();
int i = aenumfish.length;
for (int j = 0; j < i; ++j) {
EnumFish enumfish = aenumfish[j];
if (enumfish.i()) {
this.a(new ItemStack(Items.RAW_FISH, 1, enumfish.a()), new ItemStack(Items.COOKED_FISH, 1, enumfish.a()), 0.35F);
}
}
this.registerRecipe(Blocks.COAL_ORE, new ItemStack(Items.COAL), 0.1F);
this.registerRecipe(Blocks.REDSTONE_ORE, new ItemStack(Items.REDSTONE), 0.7F);
this.registerRecipe(Blocks.LAPIS_ORE, new ItemStack(Items.INK_SACK, 1, 4), 0.2F);
this.registerRecipe(Blocks.QUARTZ_ORE, new ItemStack(Items.QUARTZ), 0.2F);
}
public void registerRecipe(int i, ItemStack itemstack, float f) {
this.recipes.put(Integer.valueOf(i), itemstack);
this.c.put(Integer.valueOf(itemstack.id), Float.valueOf(f));
public void registerRecipe(Block block, ItemStack itemstack, float f) {
this.a(Item.getItemOf(block), itemstack, f);
}
public ItemStack getResult(int i) {
return (ItemStack) this.recipes.get(Integer.valueOf(i));
public void a(Item item, ItemStack itemstack, float f) {
this.a(new ItemStack(item, 1, 32767), itemstack, f);
}
public void a(ItemStack itemstack, ItemStack itemstack1, float f) {
this.recipes.put(itemstack, itemstack1);
this.c.put(itemstack1, Float.valueOf(f));
}
public ItemStack getResult(ItemStack itemstack) {
Iterator iterator = this.recipes.entrySet().iterator();
Entry entry;
do {
if (!iterator.hasNext()) {
return null;
}
entry = (Entry) iterator.next();
} while (!this.a(itemstack, (ItemStack) entry.getKey()));
return (ItemStack) entry.getValue();
}
private boolean a(ItemStack itemstack, ItemStack itemstack1) {
return itemstack1.getItem() == itemstack.getItem() && (itemstack1.getData() == 32767 || itemstack1.getData() == itemstack.getData());
}
public Map getRecipes() {
return this.recipes;
}
public float c(int i) {
return this.c.containsKey(Integer.valueOf(i)) ? ((Float) this.c.get(Integer.valueOf(i))).floatValue() : 0.0F;
public float b(ItemStack itemstack) {
Iterator iterator = this.c.entrySet().iterator();
Entry entry;
do {
if (!iterator.hasNext()) {
return 0.0F;
}
entry = (Entry) iterator.next();
} while (!this.a(itemstack, (ItemStack) entry.getKey()));
return ((Float) entry.getValue()).floatValue();
}
}