mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-08-23 14:22:47 +02:00
a24d3fc1a7
It looks like that for 2 purpur patches we need to update the upstream. Updated also the script and now we have `yatopia tup`, which will only update tuinity.
80 lines
3.0 KiB
Diff
80 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
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 2cbfef98508bcb07db1ad1e5bdafc4cc2bff1393..64adf87f2fe9921e49bf7a76170bb9908dfdaf19 100644
|
|
--- a/src/main/java/net/minecraft/server/CraftingManager.java
|
|
+++ b/src/main/java/net/minecraft/server/CraftingManager.java
|
|
@@ -83,7 +83,22 @@ 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<T> optional = recipes.a(c0.getCurrentRecipe(), world, c0);
|
|
+ optional.ifPresent(c0::setCurrentRecipe);
|
|
+ return optional;
|
|
+ }
|
|
+ for (IRecipe<C> rep : this.a(recipes)) {
|
|
+ Optional<T> 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 <C extends IInventory, T extends IRecipe<C>> List<T> a(Recipes<T> recipes) {
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
|
index 99bd8626b28a837f0da2268d89fddb6d28b2a944..cee623e5711565703fb16e7ad057e3950fb49e79 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
|
@@ -83,7 +83,14 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
|
this.c = recipes;
|
|
}
|
|
|
|
+ private static Map<Item, Integer> cachedFuelMap = null; // Yatopia
|
|
+
|
|
public static Map<Item, Integer> f() {
|
|
+ // Yatopia start
|
|
+ if(cachedFuelMap != null) {
|
|
+ return cachedFuelMap;
|
|
+ }
|
|
+ // Yatopia end
|
|
Map<Item, Integer> map = Maps.newLinkedHashMap();
|
|
|
|
a(map, (IMaterial) Items.LAVA_BUCKET, 20000);
|
|
@@ -146,6 +153,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;
|
|
}
|
|
|
|
@@ -599,4 +607,17 @@ 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
|
|
+
|
|
}
|