Skip to content

Commit d39ea7c

Browse files
gabizougabizou
committed
feat(minecraft): update to 26.2-snapshot-5
Adds content such as Potent Sulfur state representation. Adds a deprecation for CommandTreeNodeTypes.COLOR as it's been split now. See: https://minecraft.wiki/w/Java_Edition_26.2_Snapshot_5
1 parent b6177b7 commit d39ea7c

12 files changed

Lines changed: 165 additions & 11 deletions

File tree

‎gradle/verification-metadata.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<trusted-artifacts>
77
<trust file=".*-javadoc[.]jar" regex="true"/>
88
<trust file=".*-sources[.]jar" regex="true"/>
9-
<trust file=".*[.]pom" regex="true"/>
109
<trust file=".*[.]module" regex="true"/>
10+
<trust file=".*[.]pom" regex="true"/>
1111
</trusted-artifacts>
1212
</configuration>
1313
<components>
@@ -346,14 +346,6 @@
346346
<sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle"/>
347347
</artifact>
348348
</component>
349-
<component group="com.google.errorprone" name="error_prone_annotations" version="2.45.0">
350-
<artifact name="error_prone_annotations-2.45.0.jar">
351-
<sha256 value="6ba61510e22944e8aec3fe970972d088d8da132a24f2bc817a43c7b70665cc2b" origin="Generated by Gradle"/>
352-
</artifact>
353-
<artifact name="error_prone_annotations-2.45.0.pom">
354-
<sha256 value="95be73f9a87876c95aef10dcc54938e1f1c45a2850c316c33fbdecd590f51280" origin="Generated by Gradle"/>
355-
</artifact>
356-
</component>
357349
<component group="com.google.errorprone" name="error_prone_annotations" version="2.38.0">
358350
<artifact name="error_prone_annotations-2.38.0.jar">
359351
<sha256 value="6661d5335090a5fc61dd869d2095bc6c1e2156e3aa47a6e4ababdf64c99a7889" origin="Generated by Gradle"/>
@@ -362,6 +354,14 @@
362354
<sha256 value="3007bef8aff3ae8ea12d81c3feacb4f15979b2cf5c3e38fc9189a98dea141167" origin="Generated by Gradle"/>
363355
</artifact>
364356
</component>
357+
<component group="com.google.errorprone" name="error_prone_annotations" version="2.45.0">
358+
<artifact name="error_prone_annotations-2.45.0.jar">
359+
<sha256 value="6ba61510e22944e8aec3fe970972d088d8da132a24f2bc817a43c7b70665cc2b" origin="Generated by Gradle"/>
360+
</artifact>
361+
<artifact name="error_prone_annotations-2.45.0.pom">
362+
<sha256 value="95be73f9a87876c95aef10dcc54938e1f1c45a2850c316c33fbdecd590f51280" origin="Generated by Gradle"/>
363+
</artifact>
364+
</component>
365365
<component group="com.google.errorprone" name="error_prone_annotations" version="2.6.0">
366366
<artifact name="error_prone_annotations-2.6.0.jar">
367367
<sha256 value="94b131949e313af32d98538acdb80c8fd495131f0cd0e747e7dcca7866ff7283" origin="Generated by Gradle"/>

‎src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeTypes.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ public final class CommandTreeNodeTypes {
5454

5555
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> BOOL = CommandTreeNodeTypes.key(ResourceKey.brigadier("bool"));
5656

57-
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> COLOR = CommandTreeNodeTypes.key(ResourceKey.minecraft("color"));
57+
/**
58+
* @deprecated since 26.2-snapshot-5 vanilla split {@code minecraft:color} into {@code team_color} and {@code hex_color};
59+
* this constant now resolves to the {@link #TEAM_COLOR} target. Prefer {@link #TEAM_COLOR} or {@link #HEX_COLOR}
60+
* directly.
61+
*/
62+
@Deprecated
63+
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> COLOR = CommandTreeNodeTypes.key(ResourceKey.minecraft("team_color"));
5864

5965
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> COLUMN_POS = CommandTreeNodeTypes.key(ResourceKey.minecraft("column_pos"));
6066

@@ -76,6 +82,8 @@ public final class CommandTreeNodeTypes {
7682

7783
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> GAME_PROFILE = CommandTreeNodeTypes.key(ResourceKey.minecraft("game_profile"));
7884

85+
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> HEX_COLOR = CommandTreeNodeTypes.key(ResourceKey.minecraft("hex_color"));
86+
7987
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Range<Integer>>> INTEGER = CommandTreeNodeTypes.key(ResourceKey.brigadier("integer"));
8088

8189
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> INT_RANGE = CommandTreeNodeTypes.key(ResourceKey.minecraft("int_range"));
@@ -118,6 +126,8 @@ public final class CommandTreeNodeTypes {
118126

119127
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> TEAM = CommandTreeNodeTypes.key(ResourceKey.minecraft("team"));
120128

129+
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> TEAM_COLOR = CommandTreeNodeTypes.key(ResourceKey.minecraft("team_color"));
130+
121131
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> TIME = CommandTreeNodeTypes.key(ResourceKey.minecraft("time"));
122132

123133
public static final DefaultedRegistryReference<CommandTreeNodeType<CommandTreeNode.Basic>> UUID = CommandTreeNodeTypes.key(ResourceKey.minecraft("uuid"));

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.spongepowered.api.data.type.JigsawBlockOrientation;
3939
import org.spongepowered.api.data.type.PistonType;
4040
import org.spongepowered.api.data.type.PortionType;
41+
import org.spongepowered.api.data.type.PotentSulfurState;
4142
import org.spongepowered.api.data.type.RailDirection;
4243
import org.spongepowered.api.data.type.SculkSensorState;
4344
import org.spongepowered.api.data.type.SideChain;
@@ -224,6 +225,8 @@ public final class BlockStateKeys {
224225

225226
public static final Key<Value<PistonType>> PISTON_TYPE = BlockStateKeys.key(ResourceKey.minecraft("property/type"), PistonType.class);
226227

228+
public static final Key<Value<PotentSulfurState>> POTENT_SULFUR_STATE = BlockStateKeys.key(ResourceKey.minecraft("property/potent_sulfur_state"), PotentSulfurState.class);
229+
227230
public static final Key<Value<Integer>> POWER = BlockStateKeys.key(ResourceKey.minecraft("property/power"), Integer.class);
228231

229232
public static final Key<Value<Boolean>> POWERED = BlockStateKeys.key(ResourceKey.minecraft("property/powered"), Boolean.class);

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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.data.type;
26+
27+
import org.spongepowered.api.registry.DefaultedRegistryValue;
28+
import org.spongepowered.api.util.annotation.CatalogedBy;
29+
30+
@CatalogedBy(PotentSulfurStates.class)
31+
public interface PotentSulfurState extends DefaultedRegistryValue<PotentSulfurState>, Comparable<PotentSulfurState>, StringRepresentable {
32+
33+
}

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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.data.type;
26+
27+
import org.spongepowered.api.ResourceKey;
28+
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
31+
import org.spongepowered.api.registry.RegistryKey;
32+
import org.spongepowered.api.registry.RegistryScope;
33+
import org.spongepowered.api.registry.RegistryScopes;
34+
import org.spongepowered.api.registry.RegistryTypes;
35+
36+
/**
37+
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
38+
*/
39+
@SuppressWarnings("unused")
40+
@RegistryScopes(scopes = RegistryScope.GAME)
41+
public final class PotentSulfurStates {
42+
43+
public static final DefaultedRegistryReference<PotentSulfurState> DRY = PotentSulfurStates.key(ResourceKey.sponge("dry"));
44+
45+
public static final DefaultedRegistryReference<PotentSulfurState> WET = PotentSulfurStates.key(ResourceKey.sponge("wet"));
46+
47+
public static final DefaultedRegistryReference<PotentSulfurState> DORMANT = PotentSulfurStates.key(ResourceKey.sponge("dormant"));
48+
49+
public static final DefaultedRegistryReference<PotentSulfurState> ERUPTING = PotentSulfurStates.key(ResourceKey.sponge("erupting"));
50+
51+
private PotentSulfurStates() {
52+
}
53+
54+
public static Registry<PotentSulfurState> registry() {
55+
return Sponge.game().registry(RegistryTypes.POTENT_SULFUR_STATE);
56+
}
57+
58+
private static DefaultedRegistryReference<PotentSulfurState> key(final ResourceKey location) {
59+
return RegistryKey.of(RegistryTypes.POTENT_SULFUR_STATE, location).asDefaultedReference(Sponge::game);
60+
}
61+
}

‎src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,14 @@ public final class ParticleTypes {
148148

149149
public static final DefaultedRegistryReference<ParticleType> FLASH = ParticleTypes.key(ResourceKey.minecraft("flash"));
150150

151+
public static final DefaultedRegistryReference<ParticleType> GEYSER = ParticleTypes.key(ResourceKey.minecraft("geyser"));
152+
153+
public static final DefaultedRegistryReference<ParticleType> GEYSER_BASE = ParticleTypes.key(ResourceKey.minecraft("geyser_base"));
154+
155+
public static final DefaultedRegistryReference<ParticleType> GEYSER_PLUME = ParticleTypes.key(ResourceKey.minecraft("geyser_plume"));
156+
157+
public static final DefaultedRegistryReference<ParticleType> GEYSER_POOF = ParticleTypes.key(ResourceKey.minecraft("geyser_poof"));
158+
151159
public static final DefaultedRegistryReference<ParticleType> GLOW = ParticleTypes.key(ResourceKey.minecraft("glow"));
152160

153161
public static final DefaultedRegistryReference<ParticleType> GLOW_SQUID_INK = ParticleTypes.key(ResourceKey.minecraft("glow_squid_ink"));

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,10 @@ public final class SoundTypes {
11981198

11991199
public static final DefaultedRegistryReference<SoundType> BLOCK_POTENT_SULFUR_FALL = SoundTypes.key(ResourceKey.minecraft("block.potent_sulfur.fall"));
12001200

1201+
public static final DefaultedRegistryReference<SoundType> BLOCK_POTENT_SULFUR_GEYSER_ERUPTION = SoundTypes.key(ResourceKey.minecraft("block.potent_sulfur.geyser_eruption"));
1202+
1203+
public static final DefaultedRegistryReference<SoundType> BLOCK_POTENT_SULFUR_GEYSER_ERUPTION_ACTIVE = SoundTypes.key(ResourceKey.minecraft("block.potent_sulfur.geyser_eruption_active"));
1204+
12011205
public static final DefaultedRegistryReference<SoundType> BLOCK_POTENT_SULFUR_HIT = SoundTypes.key(ResourceKey.minecraft("block.potent_sulfur.hit"));
12021206

12031207
public static final DefaultedRegistryReference<SoundType> BLOCK_POTENT_SULFUR_NOXIOUS_GAS = SoundTypes.key(ResourceKey.minecraft("block.potent_sulfur.noxious_gas"));
@@ -1520,6 +1524,18 @@ public final class SoundTypes {
15201524

15211525
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sulfur.place"));
15221526

1527+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.break"));
1528+
1529+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_FALL = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.fall"));
1530+
1531+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_HIT = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.hit"));
1532+
1533+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_LAND = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.land"));
1534+
1535+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.place"));
1536+
1537+
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_SPIKE_STEP = SoundTypes.key(ResourceKey.minecraft("block.sulfur_spike.step"));
1538+
15231539
public static final DefaultedRegistryReference<SoundType> BLOCK_SULFUR_STEP = SoundTypes.key(ResourceKey.minecraft("block.sulfur.step"));
15241540

15251541
public static final DefaultedRegistryReference<SoundType> BLOCK_SUSPICIOUS_GRAVEL_BREAK = SoundTypes.key(ResourceKey.minecraft("block.suspicious_gravel.break"));

‎src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public final class AttributeTypes {
9494

9595
public static final DefaultedRegistryReference<RangedAttributeType> MOVEMENT_SPEED = AttributeTypes.key(ResourceKey.minecraft("movement_speed"));
9696

97-
public static final DefaultedRegistryReference<RangedAttributeType> NAMEPLATE_DISTANCE = AttributeTypes.key(ResourceKey.minecraft("nameplate_distance"));
97+
public static final DefaultedRegistryReference<RangedAttributeType> NAME_TAG_DISTANCE = AttributeTypes.key(ResourceKey.minecraft("name_tag_distance"));
9898

9999
public static final DefaultedRegistryReference<RangedAttributeType> OXYGEN_BONUS = AttributeTypes.key(ResourceKey.minecraft("oxygen_bonus"));
100100

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import org.spongepowered.api.data.type.PigType;
8484
import org.spongepowered.api.data.type.PistonType;
8585
import org.spongepowered.api.data.type.PortionType;
86+
import org.spongepowered.api.data.type.PotentSulfurState;
8687
import org.spongepowered.api.data.type.ProfessionType;
8788
import org.spongepowered.api.data.type.PushReaction;
8889
import org.spongepowered.api.data.type.RabbitType;
@@ -484,6 +485,8 @@ public final class RegistryTypes {
484485

485486
public static final DefaultedRegistryType<PortionType> PORTION_TYPE = RegistryTypes.spongeKeyInGame("portion_type");
486487

488+
public static final DefaultedRegistryType<PotentSulfurState> POTENT_SULFUR_STATE = RegistryTypes.spongeKeyInGame("potent_sulfur_state");
489+
487490
public static final DefaultedRegistryType<Precipitation> PRECIPITATION = RegistryTypes.spongeKeyInGame("precipitation");
488491

489492
public static final DefaultedRegistryType<QueryType> QUERY_TYPE = RegistryTypes.spongeKeyInGame("query_type");

‎src/main/java/org/spongepowered/api/state/EnumStateProperties.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ public static EnumStateProperty<PistonType> property_PISTON_TYPE() {
153153
return EnumStateProperty.of("PISTON_TYPE");
154154
}
155155

156+
public static EnumStateProperty<?> property_POTENT_SULFUR_STATE() {
157+
return EnumStateProperty.of("POTENT_SULFUR_STATE");
158+
}
159+
156160
public static EnumStateProperty<RailDirection> property_RAIL_SHAPE() {
157161
return EnumStateProperty.of("RAIL_SHAPE");
158162
}

0 commit comments

Comments
 (0)