Skip to content

Commit bd0f1cb

Browse files
authored
Update mod to Minecraft 1.21.9 (#343)
* Start update to 1.21.9 * Bump versions
1 parent 73a3bbc commit bd0f1cb

File tree

21 files changed

+73
-53
lines changed

21 files changed

+73
-53
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ dependencies {
109109

110110
modImplementation include("me.lucko:fabric-permissions-api:${project.permission_api_version}")
111111

112-
modCompileOnly('xyz.nucleoid:disguiselib-fabric:1.3.2')
112+
modCompileOnly('xyz.nucleoid:disguiselib-fabric:1.3.3')
113113
modCompileOnly('maven.modrinth:afkdisplay:1.1.0')
114114
modCompileOnly("eu.pb4:polymer-autohost:${project.polymer_version}")
115115
modCompileOnly("dev.emi:trinkets:3.10.0")

gradle.properties

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
org.gradle.jvmargs=-Xmx2G
33

44
# Fabric Properties
5-
minecraft_version=1.21.8
6-
yarn_mappings=1.21.8+build.1
7-
loader_version=0.16.14
5+
minecraft_version=1.21.9
6+
yarn_mappings=1.21.9+build.1
7+
loader_version=0.17.2
88
loom_version=1.11.+
99

1010
# Dependencies
11-
fabric_version=0.131.0+1.21.8
12-
polymer_version=0.13.9+1.21.8
13-
server_translations_version=2.5.1+1.21.5
11+
fabric_version=0.134.0+1.21.9
12+
polymer_version=0.14.2+1.21.9
13+
server_translations_version=2.5.2+1.21.9-pre3
1414
packet_tweaker_version=0.6.0-pre.1+1.21.2-pre3
15-
fantasy_version=0.6.7+1.21.5
15+
fantasy_version=0.6.8+1.21.9
1616
more_codecs_version=0.3.5+1.21.2
17-
stimuli_version=0.5.1+1.21.6
17+
stimuli_version=0.5.3+1.21.9
1818
map_templates_version=0.2.2+1.21.6
1919
substrate_version=0.2.3+1.21.5
20-
sgui_version=1.10.2+1.21.8
20+
sgui_version=1.11.0+1.21.9
2121
sidebar_api_version=0.5.1+1.21.1
22-
placeholder_api_version=2.7.1+1.21.6
23-
map_canvas_api_version=0.5.1+1.21.5
24-
player_data_api_version=0.8.0+1.21.6
25-
predicate_api_version=0.6.0+1.21.2
22+
placeholder_api_version=2.8.0+1.21.9
23+
map_canvas_api_version=0.6.0+1.21.9
24+
player_data_api_version=0.9.0+1.21.9
25+
predicate_api_version=0.6.1+1.21.9
2626
permission_api_version=0.4.0
2727

2828
# Mod Properties

src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ private void sendTeamUpdates(GameTeamKey gameTeamKey) {
398398
}
399399

400400
private TeamS2CPacket changePlayerTeam(ServerPlayerEntity player, State team, TeamS2CPacket.Operation operation) {
401-
return TeamS2CPacket.changePlayerTeam(team.scoreboardTeam, player.getGameProfile().getName(), operation);
401+
return TeamS2CPacket.changePlayerTeam(team.scoreboardTeam, player.getGameProfile().name(), operation);
402402
}
403403

404404
private PlayerListS2CPacket updatePlayerName(ServerPlayerEntity player) {

src/main/java/xyz/nucleoid/plasmid/api/game/player/JoinAcceptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public interface JoinAcceptor {
3636
default Set<UUID> playerIds() {
3737
return this.players()
3838
.stream()
39-
.map(GameProfile::getId)
39+
.map(GameProfile::id)
4040
.collect(Collectors.toSet());
4141
}
4242

@@ -46,7 +46,7 @@ default Set<UUID> playerIds() {
4646
default Set<String> playerNames() {
4747
return this.players()
4848
.stream()
49-
.map(GameProfile::getName)
49+
.map(GameProfile::name)
5050
.collect(Collectors.toSet());
5151
}
5252

src/main/java/xyz/nucleoid/plasmid/api/game/player/JoinOffer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public interface JoinOffer {
3232
default Set<UUID> playerIds() {
3333
return this.players()
3434
.stream()
35-
.map(GameProfile::getId)
35+
.map(GameProfile::id)
3636
.collect(Collectors.toSet());
3737
}
3838

@@ -42,7 +42,7 @@ default Set<UUID> playerIds() {
4242
default Set<String> playerNames() {
4343
return this.players()
4444
.stream()
45-
.map(GameProfile::getName)
45+
.map(GameProfile::name)
4646
.collect(Collectors.toSet());
4747
}
4848

src/main/java/xyz/nucleoid/plasmid/api/game/rule/GameRuleType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public final class GameRuleType {
9696
public static final GameRuleType UNSTABLE_TNT = GameRuleType.create()
9797
.enforces(BlockPlaceEvent.AFTER, result -> (player, world, pos, state) -> {
9898
if (result != EventResult.DENY && state.getBlock() == Blocks.TNT) {
99-
TntBlock.primeTnt(player.getWorld(), pos, player);
100-
player.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
99+
TntBlock.primeTnt(player.getEntityWorld(), pos, player);
100+
player.getEntityWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
101101
}
102102
});
103103

src/main/java/xyz/nucleoid/plasmid/api/util/PlayerRef.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static PlayerRef of(PlayerEntity player) {
1717
}
1818

1919
public static PlayerRef of(GameProfile profile) {
20-
return new PlayerRef(profile.getId());
20+
return new PlayerRef(profile.id());
2121
}
2222

2323
public static PlayerRef ofUnchecked(UUID id) {

src/main/java/xyz/nucleoid/plasmid/impl/command/ui/GameJoinUi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public GameJoinUi(ServerPlayerEntity player, JoinIntent intent) {
4242
}
4343

4444
private static void tryJoinGame(ServerPlayerEntity player, GameSpace gameSpace, JoinIntent joinIntent) {
45-
player.getServer().execute(() -> {
45+
player.getEntityWorld().getServer().execute(() -> {
4646
var result = GamePlayerJoiner.tryJoin(player, gameSpace, joinIntent);
4747
if (result.isError()) {
4848
player.sendMessage(result.errorCopy().formatted(Formatting.RED));

src/main/java/xyz/nucleoid/plasmid/impl/player/LocalJoinAcceptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public Set<GameProfile> players() {
3131
public Set<UUID> playerIds() {
3232
return this.serverPlayers
3333
.stream()
34-
.map(player -> player.getGameProfile().getId())
34+
.map(player -> player.getGameProfile().id())
3535
.collect(Collectors.toSet());
3636
}
3737

3838
@Override
3939
public Set<String> playerNames() {
4040
return this.serverPlayers
4141
.stream()
42-
.map(player -> player.getGameProfile().getName())
42+
.map(player -> player.getGameProfile().name())
4343
.collect(Collectors.toSet());
4444
}
4545

src/main/java/xyz/nucleoid/plasmid/impl/player/LocalJoinOffer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public Set<GameProfile> players() {
2424
public Set<UUID> playerIds() {
2525
return this.serverPlayers
2626
.stream()
27-
.map(player -> player.getGameProfile().getId())
27+
.map(player -> player.getGameProfile().id())
2828
.collect(Collectors.toSet());
2929
}
3030

3131
@Override
3232
public Set<String> playerNames() {
3333
return this.serverPlayers
3434
.stream()
35-
.map(player -> player.getGameProfile().getName())
35+
.map(player -> player.getGameProfile().name())
3636
.collect(Collectors.toSet());
3737
}
3838

0 commit comments

Comments
 (0)