Skip to content

Commit c8ada1f

Browse files
committed
merge api-14 into api-14-defaultedregistryvalue
2 parents d921b95 + 7abe65b commit c8ada1f

33 files changed

+1489
-2453
lines changed

src/main/java/org/spongepowered/api/data/Keys.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@
290290
import org.spongepowered.api.world.portal.PortalLogic;
291291
import org.spongepowered.api.world.server.ServerLocation;
292292
import org.spongepowered.api.world.server.ServerWorld;
293+
import org.spongepowered.api.world.server.WorldArchetype;
294+
import org.spongepowered.api.world.server.WorldArchetypeType;
293295
import org.spongepowered.api.world.server.storage.ServerWorldProperties;
294296
import org.spongepowered.api.world.storage.WorldProperties;
295297
import org.spongepowered.api.world.weather.Weather;
@@ -3550,6 +3552,18 @@ public final class Keys {
35503552
*/
35513553
public static final Key<Value<Sheep>> WOLOLO_TARGET = Keys.key(ResourceKey.sponge("wololo_target"), Sheep.class);
35523554

3555+
/**
3556+
* The {@link WorldArchetype} of a {@link World} or {@link ServerWorldProperties}
3557+
* Readonly
3558+
*/
3559+
public static final Key<Value<WorldArchetype>> WORLD_ARCHETYPE = Keys.key(ResourceKey.sponge("world_archetype"), WorldArchetype.class);
3560+
3561+
/**
3562+
* The {@link WorldArchetypeType} of a {@link World} or {@link ServerWorldProperties}
3563+
* Readonly
3564+
*/
3565+
public static final Key<Value<WorldArchetypeType>> WORLD_ARCHETYPE_TYPE = Keys.key(ResourceKey.sponge("world_archetype_type"), WorldArchetypeType.class);
3566+
35533567
/**
35543568
* The world border of {@link WorldProperties}
35553569
* Readonly

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageFunction.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)