Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-24 07:10:10 +01:00
80 Zeilen
2.9 KiB
Diff
80 Zeilen
2.9 KiB
Diff
--- a/net/minecraft/server/RecipesFurnace.java
|
|
+++ b/net/minecraft/server/RecipesFurnace.java
|
|
@@ -9,8 +9,10 @@
|
|
public class RecipesFurnace {
|
|
|
|
private static final RecipesFurnace a = new RecipesFurnace();
|
|
- public final Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
|
|
+ public Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
|
|
private final Map<ItemStack, Float> experience = Maps.newHashMap();
|
|
+ public Map<ItemStack,ItemStack> customRecipes = Maps.newHashMap(); // CraftBukkit - add field
|
|
+ public Map<ItemStack,Float> customExperience = Maps.newHashMap(); // CraftBukkit - add field
|
|
|
|
public static RecipesFurnace getInstance() {
|
|
return RecipesFurnace.a;
|
|
@@ -55,6 +57,12 @@
|
|
this.registerRecipe(Blocks.QUARTZ_ORE, new ItemStack(Items.QUARTZ), 0.2F);
|
|
}
|
|
|
|
+ // CraftBukkit start - add method
|
|
+ public void registerRecipe(ItemStack itemstack, ItemStack itemstack1, float f) {
|
|
+ this.customRecipes.put(itemstack, itemstack1);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public void registerRecipe(Block block, ItemStack itemstack, float f) {
|
|
this.a(Item.getItemOf(block), itemstack, f);
|
|
}
|
|
@@ -70,13 +78,23 @@
|
|
|
|
@Nullable
|
|
public ItemStack getResult(ItemStack itemstack) {
|
|
- Iterator iterator = this.recipes.entrySet().iterator();
|
|
+ // CraftBukkit start - initialize to customRecipes
|
|
+ boolean vanilla = false;
|
|
+ Iterator<Entry<ItemStack, ItemStack>> iterator = this.customRecipes.entrySet().iterator();
|
|
+ // CraftBukkit end
|
|
|
|
Entry entry;
|
|
|
|
do {
|
|
if (!iterator.hasNext()) {
|
|
- return null;
|
|
+ // CraftBukkit start - fall back to vanilla recipes
|
|
+ if (!vanilla && !this.recipes.isEmpty()) {
|
|
+ iterator = this.recipes.entrySet().iterator();
|
|
+ vanilla = true;
|
|
+ } else {
|
|
+ return null;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
entry = (Entry) iterator.next();
|
|
@@ -94,13 +112,23 @@
|
|
}
|
|
|
|
public float b(ItemStack itemstack) {
|
|
- Iterator iterator = this.experience.entrySet().iterator();
|
|
+ // CraftBukkit start - initialize to customRecipes
|
|
+ boolean vanilla = false;
|
|
+ Iterator<Entry<ItemStack, Float>> iterator = this.customExperience.entrySet().iterator();
|
|
+ // CraftBukkit end
|
|
|
|
Entry entry;
|
|
|
|
do {
|
|
if (!iterator.hasNext()) {
|
|
- return 0.0F;
|
|
+ // CraftBukkit start - fall back to vanilla recipes
|
|
+ if (!vanilla && !this.experience.isEmpty()) {
|
|
+ iterator = this.experience.entrySet().iterator();
|
|
+ vanilla = true;
|
|
+ } else {
|
|
+ return 0.0F;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
entry = (Entry) iterator.next();
|