Skip to content

Commit c905399

Browse files
committed
Update to 1.21.9-rc1
1 parent 507132f commit c905399

File tree

55 files changed

+244
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+244
-211
lines changed

gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop/
6-
minecraft_version=1.21.8
7-
minecraft_version_dependency=>=1.21.6 <=1.21.8
8-
minecraft_version_list=1.21.6,1.21.7,1.21.8
9-
minecraft_version_list_presentable=1.21.6 - 1.21.8
6+
minecraft_version=1.21.9-rc1
7+
minecraft_version_dependency=1.21.9-rc.1
8+
minecraft_version_list=1.21.9
9+
minecraft_version_list_presentable=1.21.9
1010
loader_version=0.17.2
1111
loom_version=1.11-SNAPSHOT
1212

1313
# check these on https://maven.parchmentmc.org/org/parchmentmc/data/
1414
parchment_mcversion=1.21.8
15-
parchment_version=2025.07.20
15+
parchment_version=2025.09.14
1616

1717
# Mod Properties
1818
mod_version=2.11.4
@@ -21,10 +21,10 @@ org.gradle.jvmargs=-Xmx2G
2121

2222
# Dependencies
2323
# also check this on https://fabricmc.net/develop/
24-
fabric_version=0.131.0+1.21.8
25-
clientarguments_version=1.11.4
24+
fabric_version=0.133.12+1.21.9
25+
clientarguments_version=1.11.5
2626
betterconfig_version=2.4.0
27-
simplewaypoints_version=1.0.0-alpha.4
27+
simplewaypoints_version=1.0.1-alpha.1
2828
seedfinding_core_version=1.210.0
2929
seedfinding_biome_version=1.171.1
3030
seedfinding_feature_version=1.171.11

regressionTests/playerRandomHierarchy.regressiontest

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
net/minecraft/world/level/block/entity/BaseContainerBlockEntity.canUnlock (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/LockCode;Lnet/minecraft/network/chat/Component;)Z <- net/minecraft/server/level/ServerPlayer.playNotifySound <- net/minecraft/world/entity/Entity.random
2+
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
3+
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
4+
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
25
net/minecraft/world/entity/Entity.<init> (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V <- net/minecraft/world/entity/Entity.random
36
net/minecraft/world/entity/Entity.<init> (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V <- net/minecraft/world/entity/Entity.random
47
net/minecraft/world/entity/Entity.doWaterSplashEffect ()V <- net/minecraft/world/entity/Entity.random

src/main/java/net/earthcomputer/clientcommands/c2c/C2CPacketHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void sendPacket(Packet<C2CPacketListener> packet, PlayerInfo recipient) t
113113
System.arraycopy(encrypted[i], 0, joined, i * 256, 256);
114114
}
115115
String packetString = ConversionHelper.BaseUTF8.toUnicode(joined);
116-
String commandString = "w " + recipient.getProfile().getName() + ' ' + C2C_PACKET_HEADER + packetString;
116+
String commandString = "w " + recipient.getProfile().name() + ' ' + C2C_PACKET_HEADER + packetString;
117117
if (commandString.length() >= SharedConstants.MAX_CHAT_LENGTH) {
118118
throw MESSAGE_TOO_LONG_EXCEPTION.create(commandString.length());
119119
}

src/main/java/net/earthcomputer/clientcommands/command/CDebugCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
2222
private static int execute(FabricClientCommandSource source, DebugScreenType type) {
2323
DebugScreenOverlay debugScreenOverlay = source.getClient().getDebugOverlay();
2424
switch (type) {
25-
case OVERLAY -> debugScreenOverlay.toggleOverlay();
25+
case OVERLAY -> source.getClient().debugEntries.toggleF3Visible();
2626
case FPS -> debugScreenOverlay.toggleFpsCharts();
2727
case NETWORK -> debugScreenOverlay.toggleNetworkCharts();
2828
case PROFILER -> debugScreenOverlay.toggleProfilerChart();

src/main/java/net/earthcomputer/clientcommands/command/CGameModeCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
3232
}
3333

3434
private static int getPlayerGameMode(FabricClientCommandSource source, GameProfile player) throws CommandSyntaxException {
35-
PlayerInfo playerInfo = source.getClient().getConnection().getPlayerInfo(player.getId());
35+
PlayerInfo playerInfo = source.getClient().getConnection().getPlayerInfo(player.id());
3636
if (playerInfo == null) {
3737
throw PLAYER_NOT_FOUND_EXCEPTION.create();
3838
}
3939

40-
source.sendFeedback(Component.translatable("commands.cgamemode.playerGameMode", playerInfo.getProfile().getName(), playerInfo.getGameMode().getShortDisplayName()));
40+
source.sendFeedback(Component.translatable("commands.cgamemode.playerGameMode", playerInfo.getProfile().name(), playerInfo.getGameMode().getShortDisplayName()));
4141
return Command.SINGLE_SUCCESS;
4242
}
4343

@@ -50,7 +50,7 @@ private static int listWithGameMode(FabricClientCommandSource source, GameType g
5050
source.sendFeedback(Component.translatable("commands.cgamemode.noneWithGameMode", gameMode.getShortDisplayName()));
5151
} else {
5252
source.sendFeedback(Component.translatable("commands.cgamemode.listWithGameMode", gameMode.getShortDisplayName()));
53-
playersWithGameMode.forEach(p -> source.sendFeedback(Component.literal(p.getProfile().getName())));
53+
playersWithGameMode.forEach(p -> source.sendFeedback(Component.literal(p.getProfile().name())));
5454
}
5555

5656
return playersWithGameMode.size();

src/main/java/net/earthcomputer/clientcommands/command/CTeleportCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static int teleport(FabricClientCommandSource source, UUID uuid) throws
3737
PlayerInfo playerInfo = packetListener.getPlayerInfo(uuid);
3838
String name;
3939
if (playerInfo != null) {
40-
name = playerInfo.getProfile().getName();
40+
name = playerInfo.getProfile().name();
4141
} else {
4242
name = uuid.toString();
4343
}

src/main/java/net/earthcomputer/clientcommands/command/ChatCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.mojang.brigadier.CommandDispatcher;
55
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
66
import net.minecraft.client.Minecraft;
7+
import net.minecraft.client.gui.components.ChatComponent;
78

89
import static net.earthcomputer.clientcommands.command.ClientCommandHelper.*;
910
import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
@@ -15,7 +16,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
1516

1617
private static int execute() {
1718
Minecraft.getInstance().schedule(() -> {
18-
Minecraft.getInstance().openChatScreen("");
19+
Minecraft.getInstance().openChatScreen(ChatComponent.ChatMethod.MESSAGE);
1920
sendFeedback("commands.chat.success");
2021
});
2122
return Command.SINGLE_SUCCESS;

src/main/java/net/earthcomputer/clientcommands/command/ConnectFourCommand.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.client.Minecraft;
1313
import net.minecraft.client.gui.GuiGraphics;
1414
import net.minecraft.client.gui.screens.Screen;
15+
import net.minecraft.client.input.MouseButtonEvent;
1516
import net.minecraft.client.multiplayer.ClientPacketListener;
1617
import net.minecraft.client.multiplayer.PlayerInfo;
1718
import net.minecraft.client.renderer.RenderPipelines;
@@ -67,26 +68,26 @@ public void onMove(int x, Piece piece) {
6768
}
6869

6970
if (!this.isGameActive()) {
70-
LOGGER.warn("Tried to add piece to the already completed game with {}.", this.opponent.getProfile().getName());
71+
LOGGER.warn("Tried to add piece to the already completed game with {}.", this.opponent.getProfile().name());
7172
return;
7273
}
7374

7475
if (!this.addPiece(x, piece)) {
75-
LOGGER.warn("Failed to add piece to your Connect Four game with {}.", this.opponent.getProfile().getName());
76+
LOGGER.warn("Failed to add piece to your Connect Four game with {}.", this.opponent.getProfile().name());
7677
return;
7778
}
7879

7980
if (this.isYourTurn()) {
8081
try {
81-
PutConnectFourPieceC2CPacket packet = new PutConnectFourPieceC2CPacket(connection.getLocalGameProfile().getName(), connection.getLocalGameProfile().getId(), x);
82+
PutConnectFourPieceC2CPacket packet = new PutConnectFourPieceC2CPacket(connection.getLocalGameProfile().name(), connection.getLocalGameProfile().id(), x);
8283
C2CPacketHandler.getInstance().sendPacket(packet, this.opponent);
8384
} catch (CommandSyntaxException e) {
8485
ClientCommandHelper.sendFeedback(Component.translationArg(e.getRawMessage()));
8586
}
8687
}
8788

88-
String sender = this.opponent.getProfile().getName();
89-
UUID senderUUID = this.opponent.getProfile().getId();
89+
String sender = this.opponent.getProfile().name();
90+
UUID senderUUID = this.opponent.getProfile().id();
9091
this.activePiece = piece.opposite();
9192
if ((this.winner = this.getWinner()) != null) {
9293
if (this.winner == this.yourPiece.asWinner()) {
@@ -283,7 +284,7 @@ public static class ConnectFourGameScreen extends Screen {
283284
private static final int SLOT_HEIGHT = SCALE * TEXTURE_SLOT_HEIGHT;
284285

285286
public ConnectFourGameScreen(ConnectFourGame game) {
286-
super(Component.translatable("connectFourGame.title", game.opponent.getProfile().getName()));
287+
super(Component.translatable("connectFourGame.title", game.opponent.getProfile().name()));
287288
this.game = game;
288289
}
289290

@@ -353,23 +354,23 @@ private Component getGameStateTranslate() {
353354
}
354355

355356
@Override
356-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
357+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
357358
int startX = (this.width - BOARD_WIDTH) / 2;
358359
int startY = (this.height - BOARD_HEIGHT) / 2;
359360

360361
int boardMinX = startX + BOARD_BORDER_WIDTH;
361362
int boardMaxX = startX + BOARD_WIDTH - BOARD_BORDER_WIDTH * 2;
362363
int boardMaxY = startY + BOARD_HEIGHT;
363364

364-
if (!(boardMinX <= mouseX && mouseX < boardMaxX && mouseY < boardMaxY)) {
365-
return super.mouseClicked(mouseX, mouseY, button);
365+
if (!(boardMinX <= event.x() && event.x() < boardMaxX && event.y() < boardMaxY)) {
366+
return super.mouseClicked(event, doubleClick);
366367
}
367368

368-
if (button != InputConstants.MOUSE_BUTTON_LEFT) {
369+
if (event.button() != InputConstants.MOUSE_BUTTON_LEFT) {
369370
return false;
370371
}
371372

372-
int x = (int) ((mouseX - boardMinX) / SLOT_WIDTH);
373+
int x = (int) ((event.x() - boardMinX) / SLOT_WIDTH);
373374
if (this.game.canMove()) {
374375
this.game.onMove(x, game.yourPiece);
375376
return true;

src/main/java/net/earthcomputer/clientcommands/command/FindBlockCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void onCompleted() {
8686
if (closestBlock == null) {
8787
sendError(Component.translatable("commands.cfindblock.notFound"));
8888
} else {
89-
Entity cameraEntity = Objects.requireNonNullElse(Minecraft.getInstance().cameraEntity, Minecraft.getInstance().player);
89+
Entity cameraEntity = Objects.requireNonNullElse(Minecraft.getInstance().getCameraEntity(), Minecraft.getInstance().player);
9090

9191
String foundRadius = "%.2f".formatted(Math.sqrt(closestBlock.distToCenterSqr(cameraEntity.getEyePosition(0))));
9292
sendFeedback(

src/main/java/net/earthcomputer/clientcommands/command/FindItemCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public boolean condition() {
239239

240240
@Override
241241
protected void onTick() {
242-
Entity entity = Minecraft.getInstance().cameraEntity;
242+
Entity entity = Minecraft.getInstance().getCameraEntity();
243243
if (entity == null) {
244244
_break();
245245
return;
@@ -433,7 +433,7 @@ public boolean condition() {
433433

434434
@Override
435435
protected void onTick() {
436-
Entity cameraEntity = Minecraft.getInstance().cameraEntity;
436+
Entity cameraEntity = Minecraft.getInstance().getCameraEntity();
437437
if (cameraEntity == null) {
438438
_break();
439439
return;

0 commit comments

Comments
 (0)