Skip to content

Commit 3d3f39a

Browse files
committed
Update to 1.21.6-rc1
blocked by lucko/fabric-permissions-api#34
1 parent 408efbe commit 3d3f39a

10 files changed

Lines changed: 29 additions & 12 deletions

File tree

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515

1616
stonecutter {
1717
create(rootProject) {
18-
versions("1.21.1", "1.21.4", "1.21.5")
19-
vcsVersion = "1.21.5"
18+
versions("1.21.1", "1.21.4", "1.21.5", "1.21.6-rc1")
19+
vcsVersion = "1.21.6-rc1"
2020
}
2121
}

src/main/java/me/drex/essentials/datagen/ModItemTagProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture<HolderLooku
1515

1616
@Override
1717
protected void addTags(HolderLookup.Provider wrapperLookup) {
18-
this.getOrCreateTagBuilder(ModItemTags.HAT_DENY)
18+
this.valueLookupBuilder(ModItemTags.HAT_DENY)
1919
.add(Items.BEDROCK);
2020
}
2121
}

src/main/java/me/drex/essentials/mixin/async/ServerPlayerMixin.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,22 @@
2929

3030
@Mixin(ServerPlayer.class)
3131
public abstract class ServerPlayerMixin extends Player implements AsyncTeleportPlayer {
32-
33-
public ServerPlayerMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile) {
34-
super(level, blockPos, f, gameProfile);
32+
//? if >= 1.21.6-rc1 {
33+
public ServerPlayerMixin(Level level, GameProfile gameProfile) {
34+
super(level, gameProfile);
3535
}
36+
//? } else {
37+
/*public ServerPlayerMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile) {
38+
super(level, blockPos, f, gameProfile);
39+
}*/
40+
//? }
3641

3742
@Shadow
3843
public abstract void sendSystemMessage(Component component);
3944

4045
@Shadow
4146
@Final
42-
public MinecraftServer server;
47+
MinecraftServer server;
4348

4449
@Shadow
4550
public abstract void sendSystemMessage(Component component, boolean bl);

src/main/java/me/drex/essentials/mixin/spy/ServerGamePacketListenerImplMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private void handleCommand(String command) {
5656
MutableComponent spyMessage = localized("fabric-essentials.commandspy", new HashMap<>(){{
5757
put("command", Component.literal(command));
5858
}}, PlaceholderContext.of(player));
59-
for (ServerPlayer player : player.server.getPlayerList().getPlayers()) {
59+
for (ServerPlayer player : player.getServer().getPlayerList().getPlayers()) {
6060
if (DataStorage.getPlayerData(player).commandSpy && player != this.player) {
6161
player.sendSystemMessage(spyMessage);
6262
}

stonecutter.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("dev.kikugie.stonecutter")
33
}
4-
stonecutter active "1.21.5"
4+
stonecutter active "1.21.6-rc1"
55

66
stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) {
77
group = "project"

versions/1.21.1/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ sgui_version=1.6.1+1.21.1
88
placeholder_api_version=2.4.2+1.21
99
player_data_api_version=0.6.0+1.21
1010
common_protection_api_version=1.0.0
11-
message_api_version=0.3.1+1.21.5
11+
message_api_version=0.3.2+1.21.1

versions/1.21.4/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ sgui_version=1.8.2+1.21.4
88
placeholder_api_version=2.5.2+1.21.3
99
player_data_api_version=0.7.0+1.21.3
1010
common_protection_api_version=1.0.0
11-
message_api_version=0.3.1+1.21.5
11+
message_api_version=0.3.2+1.21.4

versions/1.21.5/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ sgui_version=1.9.0+1.21.5
88
placeholder_api_version=2.6.3+1.21.5
99
player_data_api_version=0.7.0+1.21.5
1010
common_protection_api_version=1.0.0
11-
message_api_version=0.3.1+1.21.5
11+
message_api_version=0.3.2+1.21.5

versions/1.21.6-rc1/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../CHANGELOG.md
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Fabric Properties
2+
minecraft_version=1.21.6-rc1
3+
curseforge_minecraft_version=1.21.6-snapshot
4+
# Dependencies
5+
fabric_version=0.126.1+1.21.6
6+
permission_api_version=0.3.3
7+
sgui_version=1.10.0+1.21.6
8+
placeholder_api_version=2.7.0+1.21.6
9+
player_data_api_version=0.8.0+1.21.6
10+
common_protection_api_version=1.0.0
11+
message_api_version=0.3.2+1.21.5

0 commit comments

Comments
 (0)