2020-12-27 23:00:27 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: lukas <lukasalt98@gmail.com>
|
|
|
|
Date: Sun, 27 Dec 2020 16:47:00 +0100
|
|
|
|
Subject: [PATCH] Cache burn durations
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
2021-03-09 00:12:31 +01:00
|
|
|
index abc76807595611d35c86f500ef1ef51159e9406b..eb6aa82c3c25928070475815288ec215938322c7 100644
|
2020-12-27 23:00:27 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+import com.google.common.collect.ImmutableMap;
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
|
2021-03-09 00:12:31 +01:00
|
|
|
@@ -84,7 +85,15 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
2020-12-27 23:00:27 +01:00
|
|
|
this.c = recipes;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ private static Map<Item, Integer> cachedBurnDurations = null; // Paper - cache burn durations
|
|
|
|
+
|
|
|
|
+ public static Map<Item, Integer> getBurnDurations() { return f(); } // Paper - OBFHELPER
|
|
|
|
public static Map<Item, Integer> f() {
|
|
|
|
+ // Paper start - cache burn durations
|
|
|
|
+ if(cachedBurnDurations != null) {
|
|
|
|
+ return cachedBurnDurations;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
Map<Item, Integer> map = Maps.newLinkedHashMap();
|
|
|
|
|
|
|
|
a(map, (IMaterial) Items.LAVA_BUCKET, 20000);
|
2021-03-09 00:12:31 +01:00
|
|
|
@@ -147,7 +156,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
2020-12-27 23:00:27 +01:00
|
|
|
a(map, (IMaterial) Blocks.FLETCHING_TABLE, 300);
|
|
|
|
a(map, (IMaterial) Blocks.SMITHING_TABLE, 300);
|
|
|
|
a(map, (IMaterial) Blocks.COMPOSTER, 300);
|
|
|
|
- return map;
|
|
|
|
+ // Paper start - cache burn durations
|
|
|
|
+ cachedBurnDurations = ImmutableMap.copyOf(map);
|
|
|
|
+ return cachedBurnDurations;
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
// CraftBukkit start - add fields and methods
|
2021-03-09 00:12:31 +01:00
|
|
|
@@ -401,7 +413,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
2020-12-27 23:00:27 +01:00
|
|
|
} else {
|
|
|
|
Item item = itemstack.getItem();
|
|
|
|
|
|
|
|
- return (Integer) f().getOrDefault(item, 0);
|
|
|
|
+ return getBurnDurations().getOrDefault(item, 0); // Paper - cache burn durations
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-09 00:12:31 +01:00
|
|
|
@@ -414,7 +426,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
2020-10-29 23:32:14 +01:00
|
|
|
// Paper end
|
2020-12-27 23:00:27 +01:00
|
|
|
|
|
|
|
public static boolean isFuel(ItemStack itemstack) {
|
|
|
|
- return f().containsKey(itemstack.getItem());
|
|
|
|
+ return getBurnDurations().containsKey(itemstack.getItem()); // Paper - cache burn durations
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|