feat: added Block#getAttributeValue(..) and optimized positioned lookups

Author: roro1506HD

paper-api/src/main/java/io/papermc/paper/world/attribute/EnvironmentalAttribute.java

@@ -9,9 +9,7 @@ public interface EnvironmentalAttribute<T> {
 
     T getGlobal();
 
-    default T getPositioned(Position position) {
-        return this.getValue(EnvironmentalAttributeContext.builder().position(position).build());
-    }
+    T getPositioned(Position position);
 
     default T getTimed(long time) {
         return this.getValue(EnvironmentalAttributeContext.builder().time(time).build());

paper-api/src/main/java/org/bukkit/block/Block.java

@@ -1,5 +1,6 @@
 package org.bukkit.block;
 
+import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
 import java.util.Collection;
 import org.bukkit.Chunk;
 import org.bukkit.FluidCollisionMode;
@@ -834,4 +835,6 @@ default float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnch
      * @return {@code true} if the block can suffocate
      */
     boolean isSuffocating();
+
+    <T> @NotNull T getAttributeValue(@NotNull EnvironmentalAttributeType<T> type);
 }

paper-server/src/main/java/io/papermc/paper/world/attribute/PaperEnvironmentalAttribute.java

@@ -1,7 +1,9 @@
 package io.papermc.paper.world.attribute;
 
+import io.papermc.paper.math.Position;
 import io.papermc.paper.registry.data.typed.PaperTypedDataAdapter;
 import io.papermc.paper.util.MCUtil;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.attribute.EnvironmentAttributeSystem;
 
 public class PaperEnvironmentalAttribute<API, NMS> implements EnvironmentalAttribute<API> {
@@ -21,11 +23,31 @@ public API getGlobal() {
         return this.adapter.fromVanilla(this.attributeSystem.getDimensionValue(this.type.getHandle()));
     }
 
+    @Override
+    public API getPositioned(final Position position) {
+        return this.adapter.fromVanilla(this.attributeSystem.getValue(this.type.getHandle(), MCUtil.toVec3(position)));
+    }
+
+    public API getPositioned(final BlockPos blockPos) {
+        return this.adapter.fromVanilla(this.attributeSystem.getValue(this.type.getHandle(), blockPos));
+    }
+
     @Override
     public API getValue(final EnvironmentalAttributeContext context) {
+        if (context.equals(PaperEnvironmentalAttributeContext.EMPTY)) {
+            // No field is set, return the global value to prevent invalidating cache
+            return this.getGlobal();
+        }
+
+        Position position = context.position();
+        if (position != null && context.time() == null && context.rainLevel() == null && context.thunderLevel() == null) {
+            // Only position is set, return cached positioned value
+            return this.getPositioned(position);
+        }
+
         PaperEnvironmentalAttributeContext.CURRENT_CONTEXT.set((PaperEnvironmentalAttributeContext) context);
         this.attributeSystem.invalidateTickCache(); // Invalidate cache, otherwise it would return the cached value if it was already requested in the same tick
-        API value = context.position() == null ? this.getGlobal() : this.adapter.fromVanilla(this.attributeSystem.getValue(this.type.getHandle(), MCUtil.toVec3(context.position())));
+        API value = position == null ? this.getGlobal() : this.adapter.fromVanilla(this.attributeSystem.getValue(this.type.getHandle(), MCUtil.toVec3(position)));
         PaperEnvironmentalAttributeContext.CURRENT_CONTEXT.set(PaperEnvironmentalAttributeContext.EMPTY);
         return value;
     }

paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

@@ -2055,7 +2055,7 @@ public net.kyori.adventure.pointer.Pointers pointers() {
     // Paper end
 
     @Override
-    public @NotNull <T> EnvironmentalAttribute<T> getEnvironmentalAttribute(@NotNull final EnvironmentalAttributeType<T> type) {
+    public @NotNull <T> PaperEnvironmentalAttribute<T, ?> getEnvironmentalAttribute(@NotNull final EnvironmentalAttributeType<T> type) {
         return new PaperEnvironmentalAttribute<>(this.getHandle().environmentAttributes(), (PaperEnvironmentalAttributeType<T, ?>) type);
     }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java

@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -60,6 +61,7 @@
 import org.bukkit.util.BoundingBox;
 import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 public class CraftBlock implements Block {
     private final net.minecraft.world.level.LevelAccessor world;
@@ -746,4 +748,9 @@ public void randomTick() {
         this.getNMS().randomTick(level, this.position, level.random);
     }
     // Paper end
+
+    @Override
+    public <T> @NotNull T getAttributeValue(@NotNull final EnvironmentalAttributeType<T> type) {
+        return this.getCraftWorld().getEnvironmentalAttribute(type).getPositioned(this.getPosition());
+    }
 }