Skip to content

Commit 687ece5

Browse files
committed
chore(minecraft): update to 25w35a
Additions: - Add formerly server properties as game rules Breaking Change: - Rename CHAIN to IRON_CHAIN See: https://minecraft.wiki/w/Java_Edition_25w35a
1 parent e11889e commit 687ece5

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

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

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

375375
public static final DefaultedRegistryReference<BlockType> CAVE_VINES_PLANT = BlockTypes.key(ResourceKey.minecraft("cave_vines_plant"));
376376

377-
public static final DefaultedRegistryReference<BlockType> CHAIN = BlockTypes.key(ResourceKey.minecraft("chain"));
378-
379377
public static final DefaultedRegistryReference<BlockType> CHAIN_COMMAND_BLOCK = BlockTypes.key(ResourceKey.minecraft("chain_command_block"));
380378

381379
public static final DefaultedRegistryReference<BlockType> CHERRY_BUTTON = BlockTypes.key(ResourceKey.minecraft("cherry_button"));
@@ -986,6 +984,8 @@ public final class BlockTypes {
986984

987985
public static final DefaultedRegistryReference<BlockType> IRON_BLOCK = BlockTypes.key(ResourceKey.minecraft("iron_block"));
988986

987+
public static final DefaultedRegistryReference<BlockType> IRON_CHAIN = BlockTypes.key(ResourceKey.minecraft("iron_chain"));
988+
989989
public static final DefaultedRegistryReference<BlockType> IRON_DOOR = BlockTypes.key(ResourceKey.minecraft("iron_door"));
990990

991991
public static final DefaultedRegistryReference<BlockType> IRON_ORE = BlockTypes.key(ResourceKey.minecraft("iron_ore"));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,8 @@ public final class SoundTypes {
13401340

13411341
public static final DefaultedRegistryReference<SoundType> BLOCK_SHELF_STEP = SoundTypes.key(ResourceKey.minecraft("block.shelf.step"));
13421342

1343+
public static final DefaultedRegistryReference<SoundType> BLOCK_SHELF_TAKE_ITEM = SoundTypes.key(ResourceKey.minecraft("block.shelf.take_item"));
1344+
13431345
public static final DefaultedRegistryReference<SoundType> BLOCK_SHROOMLIGHT_BREAK = SoundTypes.key(ResourceKey.minecraft("block.shroomlight.break"));
13441346

13451347
public static final DefaultedRegistryReference<SoundType> BLOCK_SHROOMLIGHT_FALL = SoundTypes.key(ResourceKey.minecraft("block.shroomlight.fall"));

src/main/java/org/spongepowered/api/item/ItemTypes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,6 @@ public final class ItemTypes {
448448

449449
public static final DefaultedRegistryReference<ItemType> CAVE_SPIDER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("cave_spider_spawn_egg"));
450450

451-
public static final DefaultedRegistryReference<ItemType> CHAIN = ItemTypes.key(ResourceKey.minecraft("chain"));
452-
453451
public static final DefaultedRegistryReference<ItemType> CHAINMAIL_BOOTS = ItemTypes.key(ResourceKey.minecraft("chainmail_boots"));
454452

455453
public static final DefaultedRegistryReference<ItemType> CHAINMAIL_CHESTPLATE = ItemTypes.key(ResourceKey.minecraft("chainmail_chestplate"));
@@ -1322,6 +1320,8 @@ public final class ItemTypes {
13221320

13231321
public static final DefaultedRegistryReference<ItemType> IRON_BOOTS = ItemTypes.key(ResourceKey.minecraft("iron_boots"));
13241322

1323+
public static final DefaultedRegistryReference<ItemType> IRON_CHAIN = ItemTypes.key(ResourceKey.minecraft("iron_chain"));
1324+
13251325
public static final DefaultedRegistryReference<ItemType> IRON_CHESTPLATE = ItemTypes.key(ResourceKey.minecraft("iron_chestplate"));
13261326

13271327
public static final DefaultedRegistryReference<ItemType> IRON_DOOR = ItemTypes.key(ResourceKey.minecraft("iron_door"));

src/main/java/org/spongepowered/api/world/gamerule/GameRules.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
@RegistryScopes(scopes = RegistryScope.GAME)
4141
public final class GameRules {
4242

43+
public static final DefaultedRegistryReference<GameRule<Boolean>> ALLOW_ENTERING_NETHER_USING_PORTALS = GameRules.key(ResourceKey.sponge("allow_entering_nether_using_portals"));
44+
4345
public static final DefaultedRegistryReference<GameRule<Boolean>> ALLOW_FIRE_TICKS_AWAY_FROM_PLAYER = GameRules.key(ResourceKey.sponge("allow_fire_ticks_away_from_player"));
4446

4547
public static final DefaultedRegistryReference<GameRule<Boolean>> ANNOUNCE_ADVANCEMENTS = GameRules.key(ResourceKey.sponge("announce_advancements"));
@@ -86,6 +88,8 @@ public final class GameRules {
8688

8789
public static final DefaultedRegistryReference<GameRule<Boolean>> DROWNING_DAMAGE = GameRules.key(ResourceKey.sponge("drowning_damage"));
8890

91+
public static final DefaultedRegistryReference<GameRule<Boolean>> ENABLE_COMMAND_BLOCKS = GameRules.key(ResourceKey.sponge("enable_command_blocks"));
92+
8993
public static final DefaultedRegistryReference<GameRule<Boolean>> ENDER_PEARLS_VANISH_ON_DEATH = GameRules.key(ResourceKey.sponge("ender_pearls_vanish_on_death"));
9094

9195
public static final DefaultedRegistryReference<GameRule<Boolean>> FALL_DAMAGE = GameRules.key(ResourceKey.sponge("fall_damage"));
@@ -128,6 +132,8 @@ public final class GameRules {
128132

129133
public static final DefaultedRegistryReference<GameRule<Boolean>> PROJECTILES_CAN_BREAK_BLOCKS = GameRules.key(ResourceKey.sponge("projectiles_can_break_blocks"));
130134

135+
public static final DefaultedRegistryReference<GameRule<Boolean>> PVP = GameRules.key(ResourceKey.sponge("pvp"));
136+
131137
public static final DefaultedRegistryReference<GameRule<Integer>> RANDOM_TICK_SPEED = GameRules.key(ResourceKey.sponge("random_tick_speed"));
132138

133139
public static final DefaultedRegistryReference<GameRule<Boolean>> REDUCED_DEBUG_INFO = GameRules.key(ResourceKey.sponge("reduced_debug_info"));
@@ -138,6 +144,8 @@ public final class GameRules {
138144

139145
public static final DefaultedRegistryReference<GameRule<Integer>> SNOW_ACCUMULATION_HEIGHT = GameRules.key(ResourceKey.sponge("snow_accumulation_height"));
140146

147+
public static final DefaultedRegistryReference<GameRule<Boolean>> SPAWN_MONSTERS = GameRules.key(ResourceKey.sponge("spawn_monsters"));
148+
141149
public static final DefaultedRegistryReference<GameRule<Integer>> SPAWN_RADIUS = GameRules.key(ResourceKey.sponge("spawn_radius"));
142150

143151
public static final DefaultedRegistryReference<GameRule<Boolean>> SPECTATORS_GENERATE_CHUNKS = GameRules.key(ResourceKey.sponge("spectators_generate_chunks"));

0 commit comments

Comments
 (0)