Skip to content

Commit a2248b5

Browse files
gabizougabizou
committed
feat!(minecraft): update to 25w16a
Breaking Changes: - BlockTypeTags.PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS is split into two other tags Additions: - Added HappyGhast - Colored Harness Items - Harness related tags - HappyGhast related tags See https://minecraft.wiki/w/Java_Edition_25w16a and https://minecraft.wiki/w/Java_Edition_25w15a
1 parent 5279200 commit a2248b5

File tree

19 files changed

+159
-12
lines changed

19 files changed

+159
-12
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,8 @@ public final class BlockTypes {
740740

741741
public static final DefaultedRegistryReference<BlockType> DRAGON_WALL_HEAD = BlockTypes.key(ResourceKey.minecraft("dragon_wall_head"));
742742

743+
public static final DefaultedRegistryReference<BlockType> DRIED_GHAST = BlockTypes.key(ResourceKey.minecraft("dried_ghast"));
744+
743745
public static final DefaultedRegistryReference<BlockType> DRIED_KELP_BLOCK = BlockTypes.key(ResourceKey.minecraft("dried_kelp_block"));
744746

745747
public static final DefaultedRegistryReference<BlockType> DRIPSTONE_BLOCK = BlockTypes.key(ResourceKey.minecraft("dripstone_block"));

‎src/main/java/org/spongepowered/api/data/BlockStateKeys.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ public final class BlockStateKeys {
134134

135135
public static final Key<Value<Boolean>> DRAG = BlockStateKeys.key(ResourceKey.minecraft("property/drag"), Boolean.class);
136136

137+
public static final Key<Value<Integer>> DRIED_GHAST_HYDRATION_LEVELS = BlockStateKeys.key(ResourceKey.minecraft("property/hydration"), Integer.class);
138+
137139
public static final Key<Value<DripstoneSegment>> DRIPSTONE_THICKNESS = BlockStateKeys.key(ResourceKey.minecraft("property/thickness"), DripstoneSegment.class);
138140

139141
public static final Key<Value<Integer>> DUSTED = BlockStateKeys.key(ResourceKey.minecraft("property/dusted"), Integer.class);

‎src/main/java/org/spongepowered/api/data/type/CatTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ public static Registry<CatType> registry() {
7070
}
7171

7272
private static DefaultedRegistryReference<CatType> key(final ResourceKey location) {
73-
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asDefaultedReference(Sponge::server);
73+
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asScopedReference();
7474
}
7575
}

‎src/main/java/org/spongepowered/api/data/type/ChickenVariants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public static Registry<ChickenVariant> registry() {
5151
}
5252

5353
private static DefaultedRegistryReference<ChickenVariant> key(final ResourceKey location) {
54-
return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asDefaultedReference(Sponge::server);
54+
return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asScopedReference();
5555
}
5656
}

‎src/main/java/org/spongepowered/api/data/type/CowVariants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public static Registry<CowVariant> registry() {
5454
}
5555

5656
private static DefaultedRegistryReference<CowVariant> key(final ResourceKey location) {
57-
return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asDefaultedReference(Sponge::server);
57+
return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asScopedReference();
5858
}
5959
}

‎src/main/java/org/spongepowered/api/data/type/FrogTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public static Registry<FrogType> registry() {
5454
}
5555

5656
private static DefaultedRegistryReference<FrogType> key(final ResourceKey location) {
57-
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asDefaultedReference(Sponge::server);
57+
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asScopedReference();
5858
}
5959
}

‎src/main/java/org/spongepowered/api/data/type/PigTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public static Registry<PigType> registry() {
5454
}
5555

5656
private static DefaultedRegistryReference<PigType> key(final ResourceKey location) {
57-
return RegistryKey.of(RegistryTypes.PIG_TYPE, location).asDefaultedReference(Sponge::server);
57+
return RegistryKey.of(RegistryTypes.PIG_TYPE, location).asScopedReference();
5858
}
5959
}

‎src/main/java/org/spongepowered/api/data/type/WolfSoundVariants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ public static Registry<WolfSoundVariant> registry() {
5959
}
6060

6161
private static DefaultedRegistryReference<WolfSoundVariant> key(final ResourceKey location) {
62-
return RegistryKey.of(RegistryTypes.WOLF_SOUND_VARIANT, location).asDefaultedReference(Sponge::server);
62+
return RegistryKey.of(RegistryTypes.WOLF_SOUND_VARIANT, location).asScopedReference();
6363
}
6464
}

‎src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,24 @@ public final class SoundTypes {
584584

585585
public static final DefaultedRegistryReference<SoundType> BLOCK_DISPENSER_LAUNCH = SoundTypes.key(ResourceKey.minecraft("block.dispenser.launch"));
586586

587+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.ambient"));
588+
589+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_AMBIENT_WATER = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.ambient_water"));
590+
591+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_BREAK = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.break"));
592+
593+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_FALL = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.fall"));
594+
595+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_HIT = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.hit"));
596+
597+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_PLACE = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.place"));
598+
599+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_PLACE_IN_WATER = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.place_in_water"));
600+
601+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_STEP = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.step"));
602+
603+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_TRANSITION = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.transition"));
604+
587605
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.break"));
588606

589607
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.fall"));
@@ -594,6 +612,8 @@ public final class SoundTypes {
594612

595613
public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.step"));
596614

615+
public static final DefaultedRegistryReference<SoundType> BLOCK_DRY_GRASS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.dry_grass.ambient"));
616+
597617
public static final DefaultedRegistryReference<SoundType> BLOCK_ENCHANTMENT_TABLE_USE = SoundTypes.key(ResourceKey.minecraft("block.enchantment_table.use"));
598618

599619
public static final DefaultedRegistryReference<SoundType> BLOCK_ENDER_CHEST_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.close"));
@@ -1208,8 +1228,6 @@ public final class SoundTypes {
12081228

12091229
public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_STEP = SoundTypes.key(ResourceKey.minecraft("block.sand.step"));
12101230

1211-
public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_WIND = SoundTypes.key(ResourceKey.minecraft("block.sand.wind"));
1212-
12131231
public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_BREAK = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.break"));
12141232

12151233
public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_FALL = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.fall"));
@@ -2080,6 +2098,14 @@ public final class SoundTypes {
20802098

20812099
public static final DefaultedRegistryReference<SoundType> ENTITY_GENERIC_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.generic.swim"));
20822100

2101+
public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.ambient"));
2102+
2103+
public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.death"));
2104+
2105+
public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_HURT = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.hurt"));
2106+
2107+
public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_SPAWN = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.spawn"));
2108+
20832109
public static final DefaultedRegistryReference<SoundType> ENTITY_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ghast.ambient"));
20842110

20852111
public static final DefaultedRegistryReference<SoundType> ENTITY_GHAST_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ghast.death"));
@@ -2162,6 +2188,22 @@ public final class SoundTypes {
21622188

21632189
public static final DefaultedRegistryReference<SoundType> ENTITY_GUARDIAN_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.guardian.hurt_land"));
21642190

2191+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.ambient"));
2192+
2193+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.death"));
2194+
2195+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_EQUIP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.equip"));
2196+
2197+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.harness_goggles_down"));
2198+
2199+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.harness_goggles_up"));
2200+
2201+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HURT = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.hurt"));
2202+
2203+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_RIDING = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.riding"));
2204+
2205+
public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_UNEQUIP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.unequip"));
2206+
21652207
public static final DefaultedRegistryReference<SoundType> ENTITY_HOGLIN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.hoglin.ambient"));
21662208

21672209
public static final DefaultedRegistryReference<SoundType> ENTITY_HOGLIN_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.hoglin.angry"));
@@ -2570,8 +2612,6 @@ public final class SoundTypes {
25702612

25712613
public static final DefaultedRegistryReference<SoundType> ENTITY_POLAR_BEAR_WARNING = SoundTypes.key(ResourceKey.minecraft("entity.polar_bear.warning"));
25722614

2573-
public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.ambient"));
2574-
25752615
public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_BLOW_OUT = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.blow_out"));
25762616

25772617
public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_BLOW_UP = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.blow_up"));
@@ -3282,6 +3322,8 @@ public final class SoundTypes {
32823322

32833323
public static final DefaultedRegistryReference<SoundType> ITEM_OMINOUS_BOTTLE_DISPOSE = SoundTypes.key(ResourceKey.minecraft("item.ominous_bottle.dispose"));
32843324

3325+
public static final DefaultedRegistryReference<SoundType> ITEM_SHEARS_SNIP = SoundTypes.key(ResourceKey.minecraft("item.shears.snip"));
3326+
32853327
public static final DefaultedRegistryReference<SoundType> ITEM_SHIELD_BLOCK = SoundTypes.key(ResourceKey.minecraft("item.shield.block"));
32863328

32873329
public static final DefaultedRegistryReference<SoundType> ITEM_SHIELD_BREAK = SoundTypes.key(ResourceKey.minecraft("item.shield.break"));

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.spongepowered.api.entity.living.animal.Chicken;
4747
import org.spongepowered.api.entity.living.animal.Fox;
4848
import org.spongepowered.api.entity.living.animal.Goat;
49+
import org.spongepowered.api.entity.living.animal.HappyGhast;
4950
import org.spongepowered.api.entity.living.animal.Hoglin;
5051
import org.spongepowered.api.entity.living.animal.Ocelot;
5152
import org.spongepowered.api.entity.living.animal.Panda;
@@ -290,6 +291,8 @@ public final class EntityTypes {
290291

291292
public static final DefaultedRegistryReference<EntityType<Guardian>> GUARDIAN = EntityTypes.key(ResourceKey.minecraft("guardian"));
292293

294+
public static final DefaultedRegistryReference<EntityType<HappyGhast>> HAPPY_GHAST = EntityTypes.key(ResourceKey.minecraft("happy_ghast"));
295+
293296
public static final DefaultedRegistryReference<EntityType<Hoglin>> HOGLIN = EntityTypes.key(ResourceKey.minecraft("hoglin"));
294297

295298
public static final DefaultedRegistryReference<EntityType<HopperMinecart>> HOPPER_MINECART = EntityTypes.key(ResourceKey.minecraft("hopper_minecart"));

0 commit comments

Comments
 (0)