Skip to content

Commit 2dd2303

Browse files
committed
mark experimental features
1 parent b1d49f5 commit 2dd2303

File tree

6 files changed

+395
-5
lines changed

6 files changed

+395
-5
lines changed

src/main/java/org/spongepowered/api/block/BlockTypes.java

Lines changed: 132 additions & 0 deletions
Large diffs are not rendered by default.

src/main/java/org/spongepowered/api/entity/EntityTypes.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626

2727
import org.spongepowered.api.ResourceKey;
2828
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.entity.display.BlockDisplay;
30+
import org.spongepowered.api.entity.display.ItemDisplay;
31+
import org.spongepowered.api.entity.display.TextDisplay;
2932
import org.spongepowered.api.entity.explosive.EndCrystal;
3033
import org.spongepowered.api.entity.explosive.fused.PrimedTNT;
3134
import org.spongepowered.api.entity.hanging.ItemFrame;
@@ -48,6 +51,7 @@
4851
import org.spongepowered.api.entity.living.animal.PolarBear;
4952
import org.spongepowered.api.entity.living.animal.Rabbit;
5053
import org.spongepowered.api.entity.living.animal.Sheep;
54+
import org.spongepowered.api.entity.living.animal.Sniffer;
5155
import org.spongepowered.api.entity.living.animal.Turtle;
5256
import org.spongepowered.api.entity.living.animal.Wolf;
5357
import org.spongepowered.api.entity.living.animal.cow.Cow;
@@ -146,6 +150,7 @@
146150
import org.spongepowered.api.registry.RegistryScope;
147151
import org.spongepowered.api.registry.RegistryScopes;
148152
import org.spongepowered.api.registry.RegistryTypes;
153+
import org.spongepowered.api.util.annotation.Experimental;
149154

150155
@SuppressWarnings("unused")
151156
@RegistryScopes(scopes = RegistryScope.GAME)
@@ -169,7 +174,7 @@ public final class EntityTypes {
169174

170175
public static final DefaultedRegistryReference<EntityType<Blaze>> BLAZE = EntityTypes.key(ResourceKey.minecraft("blaze"));
171176

172-
// public static final DefaultedRegistryReference<FixMe> BLOCK_DISPLAY = EntityTypes.key(ResourceKey.minecraft("block_display"));
177+
public static final DefaultedRegistryReference<EntityType<BlockDisplay>> BLOCK_DISPLAY = EntityTypes.key(ResourceKey.minecraft("block_display"));
173178

174179
public static final DefaultedRegistryReference<EntityType<Boat>> BOAT = EntityTypes.key(ResourceKey.minecraft("boat"));
175180

@@ -263,13 +268,13 @@ public final class EntityTypes {
263268

264269
public static final DefaultedRegistryReference<EntityType<Illusioner>> ILLUSIONER = EntityTypes.key(ResourceKey.minecraft("illusioner"));
265270

266-
// public static final DefaultedRegistryReference<FixMe> INTERACTION = EntityTypes.key(ResourceKey.minecraft("interaction"));
271+
public static final DefaultedRegistryReference<EntityType<Interaction>> INTERACTION = EntityTypes.key(ResourceKey.minecraft("interaction"));
267272

268273
public static final DefaultedRegistryReference<EntityType<IronGolem>> IRON_GOLEM = EntityTypes.key(ResourceKey.minecraft("iron_golem"));
269274

270275
public static final DefaultedRegistryReference<EntityType<Item>> ITEM = EntityTypes.key(ResourceKey.minecraft("item"));
271276

272-
// public static final DefaultedRegistryReference<FixMe> ITEM_DISPLAY = EntityTypes.key(ResourceKey.minecraft("item_display"));
277+
public static final DefaultedRegistryReference<EntityType<ItemDisplay>> ITEM_DISPLAY = EntityTypes.key(ResourceKey.minecraft("item_display"));
273278

274279
public static final DefaultedRegistryReference<EntityType<ItemFrame>> ITEM_FRAME = EntityTypes.key(ResourceKey.minecraft("item_frame"));
275280

@@ -339,7 +344,8 @@ public final class EntityTypes {
339344

340345
public static final DefaultedRegistryReference<EntityType<SmallFireball>> SMALL_FIREBALL = EntityTypes.key(ResourceKey.minecraft("small_fireball"));
341346

342-
// public static final DefaultedRegistryReference<FixMe> SNIFFER = EntityTypes.key(ResourceKey.minecraft("sniffer"));
347+
@Experimental("update_1_20")
348+
public static final DefaultedRegistryReference<EntityType<Sniffer>> SNIFFER = EntityTypes.key(ResourceKey.minecraft("sniffer"));
343349

344350
public static final DefaultedRegistryReference<EntityType<Snowball>> SNOWBALL = EntityTypes.key(ResourceKey.minecraft("snowball"));
345351

@@ -359,7 +365,7 @@ public final class EntityTypes {
359365

360366
public static final DefaultedRegistryReference<EntityType<Tadpole>> TADPOLE = EntityTypes.key(ResourceKey.minecraft("tadpole"));
361367

362-
// public static final DefaultedRegistryReference<FixMe> TEXT_DISPLAY = EntityTypes.key(ResourceKey.minecraft("text_display"));
368+
public static final DefaultedRegistryReference<EntityType<TextDisplay>> TEXT_DISPLAY = EntityTypes.key(ResourceKey.minecraft("text_display"));
363369

364370
public static final DefaultedRegistryReference<EntityType<PrimedTNT>> TNT = EntityTypes.key(ResourceKey.minecraft("tnt"));
365371

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.api.entity;
26+
27+
public interface Interaction extends Entity {
28+
// TODO Data
29+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.api.entity.living.animal;
26+
27+
import org.jetbrains.annotations.ApiStatus;
28+
import org.spongepowered.api.util.annotation.Experimental;
29+
30+
@ApiStatus.Experimental
31+
@Experimental("update_1_20")
32+
public interface Sniffer extends Animal {
33+
34+
}

0 commit comments

Comments
 (0)