Spigot / Bukkit / 3fab4384ef2

Commits

DerFrZocker authored and md_5 committed 3fab4384ef2 24 Sep 2024

#1060: Cache Material to BlockType and ItemType conversion

src/main/java/org/bukkit/Material.java

Modified

-1
+package org.bukkit;
-2
-3
+import com.google.common.base.Preconditions;
-+
+import com.google.common.base.Suppliers;
-5
+import com.google.common.collect.Maps;
-6
+import com.google.common.collect.Multimap;
-7
+import java.lang.reflect.Constructor;
-8
+import java.util.Locale;
-9
+import java.util.Map;
-10
+import java.util.function.Consumer;
-+
+import java.util.function.Supplier;
-12
+import org.bukkit.attribute.Attribute;
-13
+import org.bukkit.attribute.AttributeModifier;
-14
+import org.bukkit.block.Block;
-15
+import org.bukkit.block.BlockType;
-16
+import org.bukkit.block.data.Ageable;
-17
+import org.bukkit.block.data.AnaloguePowerable;
-18
+import org.bukkit.block.data.Bisected;
-19
+import org.bukkit.block.data.BlockData;
-20
+import org.bukkit.block.data.Brushable;
-21
+import org.bukkit.block.data.Directional;
-4615
+    public static final String LEGACY_PREFIX = "LEGACY_";
-4616
-4617
+    private final int id;
-4618
+    private final Constructor<? extends MaterialData> ctor;
-4619
+    private static final Map<String, Material> BY_NAME = Maps.newHashMap();
-4620
+    private final int maxStack;
-4621
+    private final short durability;
-4622
+    public final Class<?> data;
-4623
+    private final boolean legacy;
-4624
+    private final NamespacedKey key;
-+
+    private final Supplier<ItemType> itemType;
-+
+    private final Supplier<BlockType> blockType;
-4627
-4628
+    private Material(final int id) {
-4629
+        this(id, 64);
-4630
+    }
-4631
-4632
+    private Material(final int id, final int stack) {
-4633
+        this(id, stack, MaterialData.class);
-4634
+    }
-4635
-4636
+    private Material(final int id, final int stack, final int durability) {
-4657
+            if (MaterialData.class.isAssignableFrom(data)) {
-4658
+                this.ctor = (Constructor<? extends MaterialData>) data.getConstructor(Material.class, byte.class);
-4659
+            } else {
-4660
+                this.ctor = null;
-4661
+            }
-4662
+        } catch (NoSuchMethodException ex) {
-4663
+            throw new AssertionError(ex);
-4664
+        } catch (SecurityException ex) {
-4665
+            throw new AssertionError(ex);
-4666
+        }
-+
-+
+        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);
-+
+        });
-4682
+    }
-4683
-4684
+    /**
-4685
+     * Do not use for any reason.
-4686
+     *
-4687
+     * @return ID of this material
-4688
+     * @deprecated Magic value
-4689
+     */
-4690
+    @Deprecated
-4691
+    public int getId() {
-5508
-5509
+    /**
-5510
+     * Tries to convert this Material to an item type
-5511
+     *
-5512
+     * @return the converted item type or null
-5513
+     * @apiNote only for internal use
-5514
+     */
-5515
+    @ApiStatus.Internal
-5516
+    @Nullable
-5517
+    public ItemType asItemType() {
--
+        Material material = this;
--
+        if (isLegacy()) {
--
+            material = Bukkit.getUnsafe().fromLegacy(this);
--
+        }
--
+        return Registry.ITEM.get(material.key);
-+
+        return itemType.get();
-5519
+    }
-5520
-5521
+    /**
-5522
+     * Tries to convert this Material to a block type
-5523
+     *
-5524
+     * @return the converted block type or null
-5525
+     * @apiNote only for internal use
-5526
+     */
-5527
+    @ApiStatus.Internal
-5528
+    @Nullable
-5529
+    public BlockType asBlockType() {
--
+        Material material = this;
--
+        if (isLegacy()) {
--
+            material = Bukkit.getUnsafe().fromLegacy(this);
--
+        }
--
+        return Registry.BLOCK.get(material.key);
-+
+        return blockType.get();
-5531
+    }
-5532
+}

Bukkit

Commits

Jira Issues

Add shortcut