Skip to content

Commit 4207e6f

Browse files
committed
chore(minecraft): add additions from 25w31a and 25w32a
Additions are mostly around CopperGolem and copper items. Breaking Change: - Removed Spawn Chunk Radius gamerule See: https://minecraft.wiki/w/Java_Edition_25w31a#General_2 See: https://minecraft.wiki/w/Java_Edition_25w32a
1 parent 6f5f4d6 commit 4207e6f

33 files changed

+805
-12
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=org.spongepowered
2-
version=16.0.0-SNAPSHOT
2+
version=17.0.0-SNAPSHOT
33
organization=SpongePowered
44
projectUrl=https://www.spongepowered.org
55
projectDescription=A plugin API for Minecraft: Java Edition

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
5656
mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
5757

5858
[plugins]
59-
errorprone = { id = "net.ltgt.errorprone", version = "3.1.0" }
59+
errorprone = { id = "net.ltgt.errorprone", version = "4.3.0" }
6060
eventImplGen = { id = "org.spongepowered.gradle.event-impl-gen", version = "7.1.0" }
6161
ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaExt" }
6262
indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }

gradle/verification-metadata.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,11 @@
13161316
<sha256 value="8776a213deaa1cbbadb77820225211e1b9adead2341b55cc35bc92c9076620a3" origin="Generated by Gradle"/>
13171317
</artifact>
13181318
</component>
1319+
<component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="4.3.0">
1320+
<artifact name="net.ltgt.errorprone.gradle.plugin-4.3.0.pom">
1321+
<sha256 value="3370e20ef3213ffce47f7fda31266c33e9cca3b1b7f4d54169b482277042654b" origin="Generated by Gradle"/>
1322+
</artifact>
1323+
</component>
13191324
<component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="3.1.0">
13201325
<artifact name="gradle-errorprone-plugin-3.1.0.jar">
13211326
<sha256 value="10fb66b55747ced1db9c89c8c3d0adb5dbd3f8f12f2a183bee2b5ff818d1fd6c" origin="Generated by Gradle"/>
@@ -1324,6 +1329,14 @@
13241329
<sha256 value="d393a0d3337193cb21b64a98714a1da8a966349be214cbb16171a9925a7985ee" origin="Generated by Gradle"/>
13251330
</artifact>
13261331
</component>
1332+
<component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="4.3.0">
1333+
<artifact name="gradle-errorprone-plugin-4.3.0.jar">
1334+
<sha256 value="42f89c1f582ecd09459586d3d19c0fa92a332035e4a70b5699a8ec6a81aec32c" origin="Generated by Gradle"/>
1335+
</artifact>
1336+
<artifact name="gradle-errorprone-plugin-4.3.0.module">
1337+
<sha256 value="6d2b0a7809ffde227ec15a4cf28e68929be22a1a12a0f56ad5e795d5058f2f6e" origin="Generated by Gradle"/>
1338+
</artifact>
1339+
</component>
13271340
<component group="net.sf.saxon" name="Saxon-HE" version="12.4">
13281341
<artifact name="Saxon-HE-12.4.jar">
13291342
<sha256 value="575f8b696e3b6f9aa7a3bf01611b8bf1b84576b55ce29bc16656a53a147ef441" origin="Generated by Gradle"/>
@@ -2008,11 +2021,24 @@
20082021
<sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
20092022
</artifact>
20102023
</component>
2024+
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
2025+
<artifact name="kotlin-stdlib-2.0.21.jar">
2026+
<sha256 value="f31cc53f105a7e48c093683bbd5437561d1233920513774b470805641bedbc09" origin="Generated by Gradle"/>
2027+
</artifact>
2028+
<artifact name="kotlin-stdlib-2.0.21.module">
2029+
<sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
2030+
</artifact>
2031+
</component>
20112032
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.22">
20122033
<artifact name="kotlin-stdlib-common-1.9.22.module">
20132034
<sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
20142035
</artifact>
20152036
</component>
2037+
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.0.21">
2038+
<artifact name="kotlin-stdlib-common-2.0.21.module">
2039+
<sha256 value="6f5df8af633600a6b9cfb0fcc764af3d5119f376677677b91b6aee816b1d30ab" origin="Generated by Gradle"/>
2040+
</artifact>
2041+
</component>
20162042
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
20172043
<artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
20182044
<sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>

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

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

src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ public final class BlockEntityTypes {
7272

7373
public static final DefaultedRegistryReference<BlockEntityType> CONDUIT = BlockEntityTypes.key(ResourceKey.minecraft("conduit"));
7474

75+
public static final DefaultedRegistryReference<BlockEntityType> COPPER_GOLEM_STATUE = BlockEntityTypes.key(ResourceKey.minecraft("copper_golem_statue"));
76+
7577
public static final DefaultedRegistryReference<BlockEntityType> CRAFTER = BlockEntityTypes.key(ResourceKey.minecraft("crafter"));
7678

7779
public static final DefaultedRegistryReference<BlockEntityType> CREAKING_HEART = BlockEntityTypes.key(ResourceKey.minecraft("creaking_heart"));
@@ -114,6 +116,8 @@ public final class BlockEntityTypes {
114116

115117
public static final DefaultedRegistryReference<BlockEntityType> SCULK_SHRIEKER = BlockEntityTypes.key(ResourceKey.minecraft("sculk_shrieker"));
116118

119+
public static final DefaultedRegistryReference<BlockEntityType> SHELF = BlockEntityTypes.key(ResourceKey.minecraft("shelf"));
120+
117121
public static final DefaultedRegistryReference<BlockEntityType> SHULKER_BOX = BlockEntityTypes.key(ResourceKey.minecraft("shulker_box"));
118122

119123
public static final DefaultedRegistryReference<BlockEntityType> SIGN = BlockEntityTypes.key(ResourceKey.minecraft("sign"));

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.spongepowered.api.data.type.BellAttachmentType;
3131
import org.spongepowered.api.data.type.ChestAttachmentType;
3232
import org.spongepowered.api.data.type.ComparatorMode;
33+
import org.spongepowered.api.data.type.CopperGolemPose;
3334
import org.spongepowered.api.data.type.CreakingHeartState;
3435
import org.spongepowered.api.data.type.DoorHinge;
3536
import org.spongepowered.api.data.type.DripstoneSegment;
@@ -39,6 +40,7 @@
3940
import org.spongepowered.api.data.type.PortionType;
4041
import org.spongepowered.api.data.type.RailDirection;
4142
import org.spongepowered.api.data.type.SculkSensorState;
43+
import org.spongepowered.api.data.type.SideChain;
4244
import org.spongepowered.api.data.type.SlabPortion;
4345
import org.spongepowered.api.data.type.StairShape;
4446
import org.spongepowered.api.data.type.StructureMode;
@@ -114,6 +116,8 @@ public final class BlockStateKeys {
114116

115117
public static final Key<Value<Boolean>> CONDITIONAL = BlockStateKeys.key(ResourceKey.minecraft("property/conditional"), Boolean.class);
116118

119+
public static final Key<Value<CopperGolemPose>> COPPER_GOLEM_POSE = BlockStateKeys.key(ResourceKey.minecraft("property/copper_golem_pose"), CopperGolemPose.class);
120+
117121
public static final Key<Value<Boolean>> CRACKED = BlockStateKeys.key(ResourceKey.minecraft("property/cracked"), Boolean.class);
118122

119123
public static final Key<Value<Boolean>> CRAFTING = BlockStateKeys.key(ResourceKey.minecraft("property/crafting"), Boolean.class);
@@ -254,6 +258,8 @@ public final class BlockStateKeys {
254258

255259
public static final Key<Value<Boolean>> SHRIEKING = BlockStateKeys.key(ResourceKey.minecraft("property/shrieking"), Boolean.class);
256260

261+
public static final Key<Value<SideChain>> SIDE_CHAIN_PART = BlockStateKeys.key(ResourceKey.minecraft("property/side_chain"), SideChain.class);
262+
257263
public static final Key<Value<Boolean>> SIGNAL_FIRE = BlockStateKeys.key(ResourceKey.minecraft("property/signal_fire"), Boolean.class);
258264

259265
public static final Key<Value<SlabPortion>> SLAB_TYPE = BlockStateKeys.key(ResourceKey.minecraft("property/type"), SlabPortion.class);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public interface DataManager {
131131
* be read by a plugin-data datastore.
132132
*
133133
* @param legacyId The legacy id
134-
* @param dataStoreKey The dataStore key set in {@link org.spongepowered.api.data.persistence.DataStore.Builder.HolderStep#pluginData(ResourceKey)}
134+
* @param dataStoreKey The dataStore key set in {@link org.spongepowered.api.data.persistence.DataStore.Builder#pluginData(ResourceKey)}
135135
*/
136136
void registerLegacyManipulatorIds(String legacyId, ResourceKey dataStoreKey);
137137

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.spongepowered.api.data.type.CatType;
6262
import org.spongepowered.api.data.type.ChestAttachmentType;
6363
import org.spongepowered.api.data.type.ComparatorMode;
64+
import org.spongepowered.api.data.type.CopperOxidation;
6465
import org.spongepowered.api.data.type.DoorHinge;
6566
import org.spongepowered.api.data.type.DripstoneSegment;
6667
import org.spongepowered.api.data.type.DyeColor;
@@ -173,6 +174,7 @@
173174
import org.spongepowered.api.entity.living.aquatic.fish.Pufferfish;
174175
import org.spongepowered.api.entity.living.aquatic.fish.school.Salmon;
175176
import org.spongepowered.api.entity.living.aquatic.fish.school.TropicalFish;
177+
import org.spongepowered.api.entity.living.golem.CopperGolem;
176178
import org.spongepowered.api.entity.living.golem.IronGolem;
177179
import org.spongepowered.api.entity.living.golem.Shulker;
178180
import org.spongepowered.api.entity.living.monster.Blaze;
@@ -256,6 +258,7 @@
256258
import org.spongepowered.api.raid.RaidWave;
257259
import org.spongepowered.api.registry.DefaultedRegistryType;
258260
import org.spongepowered.api.statistic.Statistic;
261+
import org.spongepowered.api.tag.BlockTypeTags;
259262
import org.spongepowered.api.tag.Tag;
260263
import org.spongepowered.api.util.Axis;
261264
import org.spongepowered.api.util.Color;
@@ -788,6 +791,13 @@ public final class Keys {
788791
*/
789792
public static final Key<Value<ItemType>> CONTAINER_ITEM = Keys.key(ResourceKey.sponge("container_item"), ItemType.class);
790793

794+
/**
795+
* The {@link CopperOxidation} state of a {@link BlockState block}
796+
* (given that it applies to the {@link BlockTypeTags#COPPER} tag) or
797+
* a {@link CopperGolem}
798+
*/
799+
public static final Key<Value<CopperOxidation>> COPPER_OXIDATION = Keys.key(ResourceKey.sponge("copper_oxidation"), CopperOxidation.class);
800+
791801
/**
792802
* The {@link ItemStack} a food {@link ItemStack} converts to when eaten.
793803
*/
@@ -3507,6 +3517,12 @@ public final class Keys {
35073517
*/
35083518
public static final Key<Value<Color>> WATER_FOG_COLOR = Keys.key(ResourceKey.sponge("water_fog_color"), Color.class);
35093519

3520+
/**
3521+
* The state of whether a {@link BlockState} that is a copper block is waxed, or if a {@link CopperGolem}
3522+
* is waxed.
3523+
*/
3524+
public static final Key<Value<Boolean>> WAXED = Keys.key(ResourceKey.sponge("waxed"), Boolean.class);
3525+
35103526
/**
35113527
* The weather of a {@link ServerWorldProperties}.
35123528
*/

src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public final class ArmorMaterials {
4444

4545
public static final DefaultedRegistryReference<ArmorMaterial> CHAINMAIL = ArmorMaterials.key(ResourceKey.minecraft("chainmail"));
4646

47+
public static final DefaultedRegistryReference<ArmorMaterial> COPPER = ArmorMaterials.key(ResourceKey.minecraft("copper"));
48+
4749
public static final DefaultedRegistryReference<ArmorMaterial> DIAMOND = ArmorMaterials.key(ResourceKey.minecraft("diamond"));
4850

4951
public static final DefaultedRegistryReference<ArmorMaterial> GOLD = ArmorMaterials.key(ResourceKey.minecraft("gold"));

src/main/java/org/spongepowered/api/data/type/ChickenVariant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
import org.spongepowered.api.util.annotation.CatalogedBy;
2929

3030
@CatalogedBy(ChickenVariants.class)
31-
public interface ChickenVariant extends DefaultedRegistryValue {
31+
public interface ChickenVariant extends DefaultedRegistryValue<ChickenVariant> {
3232
}

0 commit comments

Comments
 (0)