From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 25 Jun 2020 23:40:12 +0200 Subject: [PATCH] Heavily optimize furnance fuel and recipe lookups diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java index c2af174e639396ac70eb7b520fdd641b1d2c67e6..7de6e116a7e301754c637b68be39c30f610a04d7 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -83,7 +83,24 @@ public class CraftingManager extends ResourceDataJson { }).findFirst(); c0.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found // CraftBukkit end - return recipe; + // Yatopia start + if(c0.getCurrentRecipe() != null) { + Optional optional = recipes.a(c0.getCurrentRecipe(), world, c0); + if(optional.isPresent()) { + c0.setCurrentRecipe(optional.get()); + return optional; + } + } + for(IRecipe rep : this.a(recipes)) { + Optional optional = recipes.a(rep, world, c0); + if(optional.isPresent()) { + c0.setCurrentRecipe(optional.get()); + return optional; + } + } + c0.setCurrentRecipe(null); // CraftBukkit - Clear recipe when no recipe is found + return Optional.empty(); + // Yatopia end } public > List a(Recipes recipes) { diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java index acc533ca8ad612cc439208f4adf6e3d3289c92c7..eded99b59beb7d6fe759b21fa7d3082057c741d4 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -99,7 +99,13 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I this.c = recipes; } + //Yatopia + private static Map cachedFuelMap = null; + public static Map f() { + if(cachedFuelMap != null) { + return cachedFuelMap; // Yatopia + } Map map = Maps.newLinkedHashMap(); a(map, (IMaterial) Items.LAVA_BUCKET, 20000); @@ -162,6 +168,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I a(map, (IMaterial) Blocks.FLETCHING_TABLE, 300); a(map, (IMaterial) Blocks.SMITHING_TABLE, 300); a(map, (IMaterial) Blocks.COMPOSTER, 300); + cachedFuelMap = map; // Yatopia return map; } @@ -615,4 +622,19 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I } } + + // Yatopia start + private IRecipe cachedRecipe = null; + @Override + public IRecipe getCurrentRecipe() { + return cachedRecipe; + } + @Override + public void setCurrentRecipe(IRecipe recipe) { + cachedRecipe = recipe; + } + + + // Yatopia end + }