OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

#1060: Cache Material to BlockType and ItemType conversion

Browse source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
Bukkit/Spigot 2024-09-24 21:07:47 +10:00
parent f73b5cbdb3
commit 3ea55de712
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
paper-api/src/main/java/org/bukkit/Material.java
View file

@ -1,12 +1,14 @@
package org.bukkit; package org.bukkit;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Suppliers;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier;
import org.bukkit.attribute.Attribute; import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeModifier; import org.bukkit.attribute.AttributeModifier;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -4620,6 +4622,8 @@ public enum Material implements Keyed, Translatable {
public final Class<?> data; public final Class<?> data;
private final boolean legacy; private final boolean legacy;
private final NamespacedKey key; private final NamespacedKey key;
private final Supplier<ItemType> itemType;
private final Supplier<BlockType> blockType;
private Material(final int id) { private Material(final int id) {
this(id, 64); this(id, 64);
@ -4660,6 +4664,21 @@ public enum Material implements Keyed, Translatable {
} catch (SecurityException ex) { } catch (SecurityException ex) {
throw new AssertionError(ex); throw new AssertionError(ex);
} }
this.itemType = Suppliers.memoize(() -> {
Material material = this;
if (isLegacy()) {
material = Bukkit.getUnsafe().fromLegacy(new MaterialData(this), true);
}
return Registry.ITEM.get(material.key);
});
this.blockType = Suppliers.memoize(() -> {
Material material = this;
if (isLegacy()) {
material = Bukkit.getUnsafe().fromLegacy(new MaterialData(this), false);
}
return Registry.BLOCK.get(material.key);
});
} }
/** /**
@ -5496,11 +5515,7 @@ public enum Material implements Keyed, Translatable {
@ApiStatus.Internal @ApiStatus.Internal
@Nullable @Nullable
public ItemType asItemType() { public ItemType asItemType() {
Material material = this; return itemType.get();
if (isLegacy()) {
material = Bukkit.getUnsafe().fromLegacy(this);
}
return Registry.ITEM.get(material.key);
} }
/** /**
@ -5512,10 +5527,6 @@ public enum Material implements Keyed, Translatable {
@ApiStatus.Internal @ApiStatus.Internal
@Nullable @Nullable
public BlockType asBlockType() { public BlockType asBlockType() {
Material material = this; return blockType.get();
if (isLegacy()) {
material = Bukkit.getUnsafe().fromLegacy(this);
}
return Registry.BLOCK.get(material.key);
} }
} }