Un-break for versions <1.21.3

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Minecraft expectations
-paper = "1.21.3-R0.1-SNAPSHOT"
+paper = "1.21-R0.1-SNAPSHOT"
 fastutil = "8.5.9"
 guava = "31.1-jre"
 log4j = "2.19.0"

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -62,9 +62,8 @@
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.Tag;
-import org.bukkit.block.Biome;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -89,7 +88,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -250,21 +248,23 @@ private void setupWorldData() {
         // datapacks aren't loaded until just before the world is, and bukkit has no event for this
         // so the earliest we can do this is in WorldInit
         setupTags();
-        setupBiomes(false); // FAWE - load biomes later. Initialize biomes twice to allow for the registry to be present for
         // plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE.
         WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform));
     }
 
     @SuppressWarnings({"deprecation", "unchecked"})
     private void initializeRegistries() {
-        // FAWE start - move Biomes to their own method. Initialize biomes twice to allow for the registry to be present for
-        // plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE.
-        setupBiomes(true);
-        // FAWE end
+        // Biome
+        Registry.BIOME.forEach(biome -> {
+            if (!biome.name().equals("CUSTOM")) {
+                String key = biome.getKey().toString();
+                BiomeType.REGISTRY.register(key, new BiomeType(key));
+            }
+        });
         /*
 
         // Block & Item
-        for (Material material : Material.values()) {
+        Registry.MATERIAL.forEach(material -> {
             if (material.isBlock() && !material.isLegacy()) {
                 BlockType.REGISTRY.register(material.getKey().toString(), new BlockType(material.getKey().toString(), blockState -> {
                     // TODO Use something way less hacky than this.
@@ -291,17 +291,14 @@ private void initializeRegistries() {
             if (material.isItem() && !material.isLegacy()) {
                 ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString()));
             }
-        }
-*/
-
+        });
+        */
         // Entity
-        for (org.bukkit.entity.EntityType entityType : org.bukkit.entity.EntityType.values()) {
-            String mcid = entityType.getName();
-            if (mcid != null) {
-                String lowerCaseMcId = mcid.toLowerCase(Locale.ROOT);
-                EntityType.REGISTRY.register("minecraft:" + lowerCaseMcId, new EntityType("minecraft:" + lowerCaseMcId));
-            }
-        }
+        Registry.ENTITY_TYPE.forEach(entityType -> {
+            String key = entityType.getKey().toString();
+            EntityType.REGISTRY.register(key, new EntityType(key));
+        });
+
         // ... :|
         GameModes.get("");
         WeatherTypes.get("");
@@ -322,38 +319,6 @@ private void setupTags() {
         }
     }
 
-    // FAWE start
-    private void setupBiomes(boolean expectFail) {
-        if (this.adapter.value().isPresent()) {
-            // Biomes are stored globally in the server. Registries are not kept per-world in Minecraft.
-            // The WorldServer get-registries method simply delegates to the MinecraftServer method.
-            for (final NamespacedKey biome : ((BukkitImplAdapter<?>) adapter.value().get()).getRegisteredBiomes()) {
-                BiomeType biomeType;
-                if ((biomeType = BiomeType.REGISTRY.get(biome.toString())) == null) { // only register once
-                    biomeType = new BiomeType(biome.toString());
-                    BiomeType.REGISTRY.register(biome.toString(), biomeType);
-                }
-                biomeType.setLegacyId(adapter.value().get().getInternalBiomeId(biomeType));
-            }
-        } else {
-            if (!expectFail) {
-                LOGGER.warn("Failed to load biomes via adapter (not present). Will load via bukkit");
-            }
-            for (Biome biome : Biome.values()) {
-                // Custom is bad
-                if (biome.name().equals("CUSTOM")) {
-                    continue;
-                }
-                String lowerCaseBiome = biome.getKey().toString().toLowerCase(Locale.ROOT);
-                // only register once
-                if (BiomeType.REGISTRY.get(lowerCaseBiome) == null) {
-                    BiomeType.REGISTRY.register(lowerCaseBiome, new BiomeType(lowerCaseBiome));
-                }
-            }
-        }
-    }
-    // FAWE end
-
     private void loadAdapter() {
         WorldEdit worldEdit = WorldEdit.getInstance();
 

worldedit-bukkit/src/test/java/com/sk89q/wepif/TestOfflinePermissible.java

@@ -376,9 +376,4 @@ public void setStatistic(
         return null;
     }
 
-    @Override
-    public @NotNull PersistentDataContainerView getPersistentDataContainer() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
 }