Add BlockState.getMaterial()

TomyLobo · TomyLobo · commit c7b06ac44f98 · 2026-04-19T22:49:43.000+02:00
diff --git a/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java
@@ -175,6 +175,7 @@
 import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTag;
 import org.enginehub.linbus.tree.LinTagType;
+import org.jspecify.annotations.NonNull;
 import org.spigotmc.SpigotConfig;
 import org.spigotmc.WatchdogThread;
 
@@ -578,6 +579,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
         return new PaperweightBlockMaterial(mcBlockState);
     }
 
+    @Override
+    public @NonNull BlockMaterial getBlockMaterial(BlockState blockState) {
+        return new PaperweightBlockMaterial(adapt(blockState));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
         @Override
diff --git a/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java
@@ -172,6 +172,7 @@
 import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTag;
 import org.enginehub.linbus.tree.LinTagType;
+import org.jspecify.annotations.NonNull;
 import org.spigotmc.SpigotConfig;
 import org.spigotmc.WatchdogThread;
 
@@ -567,6 +568,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
         return new PaperweightBlockMaterial(mcBlockState);
     }
 
+    @Override
+    public @NonNull BlockMaterial getBlockMaterial(BlockState blockState) {
+        return new PaperweightBlockMaterial(adapt(blockState));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
         @Override
diff --git a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java
@@ -172,6 +172,7 @@
 import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTag;
 import org.enginehub.linbus.tree.LinTagType;
+import org.jspecify.annotations.NonNull;
 import org.spigotmc.SpigotConfig;
 import org.spigotmc.WatchdogThread;
 
@@ -565,6 +566,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
         return new PaperweightBlockMaterial(mcBlockState);
     }
 
+    @Override
+    public @NonNull BlockMaterial getBlockMaterial(BlockState blockState) {
+        return new PaperweightBlockMaterial(adapt(blockState));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
         @Override
diff --git a/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java
@@ -176,6 +176,7 @@
 import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTag;
 import org.enginehub.linbus.tree.LinTagType;
+import org.jspecify.annotations.NonNull;
 import org.spigotmc.SpigotConfig;
 import org.spigotmc.WatchdogThread;
 
@@ -579,6 +580,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
         return new PaperweightBlockMaterial(mcBlockState);
     }
 
+    @Override
+    public @NonNull BlockMaterial getBlockMaterial(BlockState blockState) {
+        return new PaperweightBlockMaterial(adapt(blockState));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
         @Override
diff --git a/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java
@@ -175,6 +175,7 @@
 import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTag;
 import org.enginehub.linbus.tree.LinTagType;
+import org.jspecify.annotations.NonNull;
 import org.spigotmc.SpigotConfig;
 import org.spigotmc.WatchdogThread;
 
@@ -578,6 +579,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
         return new PaperweightBlockMaterial(mcBlockState);
     }
 
+    @Override
+    public @NonNull BlockMaterial getBlockMaterial(BlockState blockState) {
+        return new PaperweightBlockMaterial(adapt(blockState));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
         @Override
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
@@ -61,6 +61,21 @@ public BlockMaterial getMaterial(BlockType blockType) {
         });
     }
 
+    @Override
+    public @org.jspecify.annotations.Nullable BlockMaterial getMaterial(BlockState blockState) {
+        Material mat = BukkitAdapter.adapt(blockState.getBlockType());
+        if (mat == null) {
+            return null;
+        }
+        return materialMap.computeIfAbsent(mat, material -> {
+            BlockMaterial platformMaterial = null;
+            if (WorldEditPlugin.getInstance().getBukkitImplAdapter() != null) {
+                platformMaterial = WorldEditPlugin.getInstance().getBukkitImplAdapter().getBlockMaterial(blockState);
+            }
+            return new BukkitBlockMaterial(platformMaterial, material);
+        });
+    }
+
     @Nullable
     @Override
     public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
@@ -161,6 +161,16 @@ default void tickWatchdog() {
     @Nullable
     BlockMaterial getBlockMaterial(BlockType blockType);
 
+    /**
+     * Gets the block material for the given block state.
+     *
+     * @param blockState the block state
+     * @return the material
+     */
+    default @org.jspecify.annotations.Nullable BlockMaterial getBlockMaterial(BlockState blockState) {
+        return getBlockMaterial(blockState.getBlockType());
+    }
+
     /**
      * Get a map of {@code string -> property}.
      *
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
@@ -24,6 +24,7 @@
 import com.sk89q.worldedit.blocks.TileEntityBlock;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.concurrency.LazyReference;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
 import org.enginehub.linbus.format.snbt.LinStringIO;
 import org.enginehub.linbus.tree.LinCompoundTag;
 import org.enginehub.linbus.tree.LinStringTag;
@@ -104,6 +105,11 @@ public BlockType getBlockType() {
         return this.blockState.getBlockType();
     }
 
+    @Override
+    public BlockMaterial getMaterial() {
+        return blockState.getMaterial();
+    }
+
     @Override
     public <V> BaseBlock with(Property<V> property, V value) {
         return this.blockState.with(property, value).toBaseBlock(getNbtReference());
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
@@ -19,9 +19,12 @@
 
 package com.sk89q.worldedit.world.block;
 
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.concurrency.LazyReference;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
 import org.enginehub.linbus.tree.LinCompoundTag;
 
 import java.util.HashSet;
@@ -74,6 +77,12 @@ public BlockType getBlockType() {
         return this.blockType;
     }
 
+    @Override
+    public BlockMaterial getMaterial() {
+        return WorldEdit.getInstance().getPlatformManager()
+                .queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getMaterial(this);
+    }
+
     @Override
     public <V> BlockState with(final Property<V> property, final V value) {
         if (this.stateListIndex == -1) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
@@ -26,6 +26,7 @@
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.concurrency.LazyReference;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
 import org.enginehub.linbus.tree.LinCompoundTag;
 
 import java.util.Locale;
@@ -41,6 +42,15 @@ public interface BlockStateHolder<B extends BlockStateHolder<B>> extends Pattern
      */
     BlockType getBlockType();
 
+    /**
+     * Get the block material.
+     *
+     * @return The material
+     */
+    default BlockMaterial getMaterial() {
+        return getBlockType().getMaterial();
+    }
+
     /**
      * Returns a BlockState with the given state and value applied.
      *
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
@@ -63,6 +63,17 @@ default String getName(BlockType blockType) {
     @Nullable
     BlockMaterial getMaterial(BlockType blockType);
 
+    /**
+     * Get the material for the given block state.
+     *
+     * @param blockState the block state
+     * @return the material, or null if the material information is not known
+     */
+    @Nullable
+    default BlockMaterial getMaterial(BlockState blockState) {
+        return getMaterial(blockState.getBlockType());
+    }
+
     /**
      * Get an unmodifiable map of states for this block.
      *
diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockRegistry.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockRegistry.java
@@ -28,6 +28,7 @@
 import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.BlockRegistry;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -53,6 +54,14 @@ public BlockMaterial getMaterial(BlockType blockType) {
         );
     }
 
+    @Override
+    public @Nullable BlockMaterial getMaterial(BlockState blockState) {
+        return materialMap.computeIfAbsent(
+                FabricAdapter.adapt(blockState),
+                FabricBlockMaterial::new
+        );
+    }
+
     @Override
     public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
         Block block = FabricAdapter.adapt(blockType);
diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeBlockRegistry.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeBlockRegistry.java
@@ -28,6 +28,7 @@
 import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.BlockRegistry;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -53,6 +54,14 @@ public BlockMaterial getMaterial(BlockType blockType) {
         );
     }
 
+    @Override
+    public @Nullable BlockMaterial getMaterial(BlockState blockState) {
+        return materialMap.computeIfAbsent(
+                NeoForgeAdapter.adapt(blockState),
+                NeoForgeBlockMaterial::new
+        );
+    }
+
     @Override
     public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
         Block block = NeoForgeAdapter.adapt(blockType);
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java
@@ -27,6 +27,7 @@
 import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.BlockRegistry;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.RegistryTypes;
@@ -66,6 +67,20 @@ public BlockMaterial getMaterial(BlockType blockType) {
         );
     }
 
+    @Override
+    public @Nullable BlockMaterial getMaterial(BlockState blockState) {
+        return materialMap.computeIfAbsent(
+                SpongeAdapter.adapt(blockState),
+                m -> {
+                    net.minecraft.world.level.block.state.BlockState mcBlockState =
+                            (net.minecraft.world.level.block.state.BlockState) m;
+                    return new SpongeBlockMaterial(
+                            mcBlockState
+                    );
+                }
+        );
+    }
+
     @Override
     public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
         org.spongepowered.api.block.BlockType spongeBlockType =
