move getEnvironmentalAttribute in RegionAccessor

Author: Lulu13022002

paper-api/src/main/java/org/bukkit/RegionAccessor.java

@@ -1,5 +1,7 @@
 package org.bukkit;
 
+import io.papermc.paper.world.attribute.EnvironmentalAttribute;
+import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
 import java.util.Collection;
 import java.util.List;
 import java.util.Random;
@@ -560,4 +562,6 @@ default <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T>
      */
     boolean hasCollisionsIn(@NotNull org.bukkit.util.BoundingBox boundingBox);
     // Paper end
+
+    <T> @NotNull EnvironmentalAttribute<T> getEnvironmentalAttribute(@NotNull EnvironmentalAttributeType<T> type);
 }

paper-api/src/main/java/org/bukkit/World.java

@@ -11,8 +11,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import io.papermc.paper.world.attribute.EnvironmentalAttribute;
-import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -4562,8 +4560,6 @@ default void setNoTickViewDistance(int viewDistance) {
     @NotNull
     public Collection<GeneratedStructure> getStructures(int x, int z, @NotNull Structure structure);
 
-    <T> @NotNull EnvironmentalAttribute<T> getEnvironmentalAttribute(@NotNull EnvironmentalAttributeType<T> type);
-
     /**
      * Represents various map environment types that a world may be
      */

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

@@ -7,6 +7,9 @@
 import java.util.Random;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
+import io.papermc.paper.world.attribute.PaperEnvironmentalAttribute;
+import io.papermc.paper.world.attribute.PaperEnvironmentalAttributeType;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
@@ -501,4 +504,10 @@ public boolean hasCollisionsIn(@org.jetbrains.annotations.NotNull org.bukkit.uti
     public java.util.Set<org.bukkit.FeatureFlag> getFeatureFlags() {
         return io.papermc.paper.world.flag.PaperFeatureFlagProviderImpl.fromNms(this.getHandle().enabledFeatures());
     }
+
+    @Override
+    public <T> PaperEnvironmentalAttribute<T, ?> getEnvironmentalAttribute(final EnvironmentalAttributeType<T> type) {
+        // todo should probably restrict the position lookup for LimitedRegion
+        return new PaperEnvironmentalAttribute<>(this.getHandle().getLevel().environmentAttributes(), (PaperEnvironmentalAttributeType<T, ?>) type);
+    }
 }

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

@@ -13,10 +13,6 @@
 import io.papermc.paper.raytracing.RayTraceTarget;
 import io.papermc.paper.registry.RegistryAccess;
 import io.papermc.paper.registry.RegistryKey;
-import io.papermc.paper.world.attribute.EnvironmentalAttribute;
-import io.papermc.paper.world.attribute.EnvironmentalAttributeType;
-import io.papermc.paper.world.attribute.PaperEnvironmentalAttribute;
-import io.papermc.paper.world.attribute.PaperEnvironmentalAttributeType;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -2042,9 +2038,4 @@ public net.kyori.adventure.pointer.Pointers pointers() {
         return POINTERS_SUPPLIER.view(this);
     }
     // Paper end
-
-    @Override
-    public <T> PaperEnvironmentalAttribute<T, ?> getEnvironmentalAttribute(final EnvironmentalAttributeType<T> type) {
-        return new PaperEnvironmentalAttribute<>(this.getHandle().environmentAttributes(), (PaperEnvironmentalAttributeType<T, ?>) type);
-    }
 }