Progress

Author: aromaa

src/main/java/org/spongepowered/api/event/advancement/AdvancementTreeEvent.java

@@ -26,6 +26,7 @@
 
 import org.spongepowered.api.advancement.AdvancementTree;
 import org.spongepowered.api.event.Event;
+import org.spongepowered.api.registry.RegistryHolder;
 
 /**
  * A base interface for all the {@link AdvancementTree} events.
@@ -47,5 +48,6 @@ public interface AdvancementTreeEvent extends Event {
      */
     interface GenerateLayout extends AdvancementTreeEvent {
 
+        RegistryHolder registryHolder();
     }
 }

src/main/java/org/spongepowered/api/event/lifecycle/RegisterRegistryValueEvent.java

@@ -47,7 +47,7 @@ default <T> void registry(RegistryType<T> registryType, Consumer<RegistryStep<T>
     <T> void registry(RegistryType<T> registryType, BiConsumer<RegistryHolder, RegistryStep<T>> consumer, final RegistryType<?>... dependencies);
 
     default <T> void register(RegistryRegistrationSet<T> registrationSet) {
-        this.registry(registrationSet.registryType(), r -> registrationSet.values().forEach(r::register));
+        this.registry(registrationSet.registryType(), r -> registrationSet.values().forEach((k, v) -> r.register(k, v.get())));
     }
 
     interface RegistryStep<T> {

src/main/java/org/spongepowered/api/registry/RegistryRegistrationSet.java

@@ -34,15 +34,15 @@ public interface RegistryRegistrationSet<T> {
 
     RegistryType<T> registryType();
 
-    Map<ResourceKey, T> values();
+    Map<ResourceKey, Supplier<T>> values();
 
     static <T> Builder<T> builder(RegistryType<T> registryType, Supplier<RegistryHolder> defaultHolder) {
         return Sponge.game().factoryProvider().provide(Factory.class).builder(registryType, defaultHolder);
     }
 
     interface Builder<T> extends org.spongepowered.api.util.Builder<RegistryRegistrationSet<T>, Builder<T>> {
 
-        DefaultedRegistryReference<T> register(ResourceKey key, T value);
+        <V extends T> DefaultedRegistryReference<V> register(ResourceKey key, Supplier<V> value);
     }
 
     interface Factory {

src/main/java/org/spongepowered/api/registry/RegistryTypes.java

@@ -187,6 +187,7 @@
 import org.spongepowered.api.world.generation.structure.jigsaw.ProcessorList;
 import org.spongepowered.api.world.generation.structure.jigsaw.ProcessorType;
 import org.spongepowered.api.world.schematic.PaletteType;
+import org.spongepowered.api.world.server.WorldArchetypeType;
 import org.spongepowered.api.world.teleport.TeleportHelperFilter;
 import org.spongepowered.api.world.weather.WeatherType;
 
@@ -520,6 +521,8 @@ public final class RegistryTypes {
 
     // @formatter:on
 
+    public static final DefaultedRegistryType<WorldArchetypeType> WORLD_ARCHETYPE_TYPE = RegistryTypes.spongeKeyInGame("wire_attachment_type");
+
     public static final DefaultedRegistryType<Recipe<?>> RECIPE = RegistryTypes.spongeKeyInGame("recipe");
 
     public static final DefaultedRegistryType<Advancement> ADVAN = RegistryTypes.spongeKeyInGame("wire_attachment_type");

src/main/java/org/spongepowered/api/world/WorldType.java

@@ -26,14 +26,15 @@
 
 import org.spongepowered.api.data.Key;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.service.context.ContextSource;
 import org.spongepowered.api.util.Builder;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(WorldTypes.class)
-public interface WorldType extends DefaultedRegistryValue, ContextSource, WorldTypeDataFetcher {
+public interface WorldType extends DefaultedRegistryValue, ContextSource, WorldTypeDataFetcher, DataPackSerializable {
 
     interface Builder extends org.spongepowered.api.util.Builder<WorldType, Builder>, CopyableBuilder<WorldType, Builder> {
 

src/main/java/org/spongepowered/api/world/server/WorldArchetypeType.java

@@ -24,10 +24,26 @@
  */
 package org.spongepowered.api.world.server;
 
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.datapack.DataPackSerializable;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.generation.ChunkGenerator;
 
-public interface WorldArchetypeType {
+@CatalogedBy(WorldArchetypeTypes.class)
+public interface WorldArchetypeType extends DefaultedRegistryValue, DataPackSerializable {
+
+    static WorldArchetypeType.Builder builder() {
+        return Sponge.game().builderProvider().provide(WorldArchetypeType.Builder.class);
+    }
+
+    static WorldArchetypeType of(WorldType worldType, ChunkGenerator chunkGenerator) {
+        return WorldArchetypeType.builder()
+            .worldType(worldType)
+            .chunkGenerator(chunkGenerator)
+            .build();
+    }
 
     WorldType worldType();
 

src/main/java/org/spongepowered/api/world/server/WorldArchetypeTypes.java

@@ -0,0 +1,53 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */package org.spongepowered.api.world.server;
+
+import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.Registry;
+import org.spongepowered.api.registry.RegistryKey;
+import org.spongepowered.api.registry.RegistryScope;
+import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
+
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
+@SuppressWarnings("unused")
+@RegistryScopes(
+    scopes = RegistryScope.ENGINE
+)
+public final class WorldArchetypeTypes {
+    private WorldArchetypeTypes() {
+    }
+
+    public static Registry<WorldArchetypeType> registry() {
+        return Sponge.server().registry(RegistryTypes.WORLD_ARCHETYPE_TYPE);
+    }
+
+    private static DefaultedRegistryReference<WorldArchetypeType> key(final ResourceKey location) {
+        return RegistryKey.of(RegistryTypes.WORLD_ARCHETYPE_TYPE, location).asDefaultedReference(Sponge::server);
+    }
+}

src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java

@@ -29,9 +29,11 @@
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.ResourceKeyed;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.entity.living.player.gamemode.GameMode;
 import org.spongepowered.api.entity.living.trader.WanderingTrader;
+import org.spongepowered.api.item.enchantment.Enchantment;
 import org.spongepowered.api.util.Identifiable;
 import org.spongepowered.api.util.MinecraftDayTime;
 import org.spongepowered.api.util.Nameable;
@@ -378,7 +380,31 @@ default Weather weather() {
 
     interface LoadOptions {
 
-        FoundOptions foundOptions();
+        static LoadOptions.Builder builder() {
+            return Sponge.game().builderProvider().provide(LoadOptions.Builder.class);
+        }
+
+        static LoadOptions load(Consumer<ServerWorldProperties> loadCallback) {
+            return LoadOptions.builder()
+                .load()
+                .loadCallback(loadCallback)
+                .build();
+        }
+
+        static LoadOptions create(WorldArchetypeType worldArchetype) {
+            return LoadOptions.builder()
+                .create(worldArchetype)
+                .build();
+        }
+
+        static LoadOptions create(WorldArchetypeType worldArchetype, Consumer<ServerWorldProperties> initializeCallback) {
+            return LoadOptions.builder()
+                .create(worldArchetype)
+                .initializeCallback(initializeCallback)
+                .build();
+        }
+
+        Optional<FoundOptions> foundOptions();
 
         Optional<CreateOptions> createOptions();