Skip to content

Commit c0f633b

Browse files
jfglzsjfglzs
committed
bump to 26.1
1 parent 184484b commit c0f633b

19 files changed

Lines changed: 178 additions & 40 deletions

‎README-en.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ Most other MC versions that are the same as the supported major versions but hav
1717

1818
| Minecraft Version | Support Status |
1919
|-------------------|--------------------------------------------------------------------------|
20-
| 1.21.10 | Supporting, developing actively |
20+
| 26.1 | Supporting, developing actively |
21+
| 1.21.11 | Supporting, developing actively |
2122
| 1.21.5 | Supporting, developing actively |
2223
| 1.21 | Supporting, developing actively |
2324
| 1.20.4 | Supporting, developing actively |
2425
| 1.20.1 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
2526
| 1.19.3 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
2627
| 1.18.2 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
27-
| 1.17.1 | Supporting, developing actively |
28+
| 1.17.1 | Not supporting, development stopped (supporting stopped on May 1, 2026) |
2829
| 1.16.5 | Not supporting, development stopped (supporting stopped on Jan 8, 2023) |
2930

3031
## Rules

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ Language: [English](https://github.com/OptiJava/OptCarpetAddition/blob/master/RE
1616

1717
| Minecraft 版本 | 支持状态 |
1818
|--------------|----------------------------|
19-
| 1.21.10 | 支持，积极开发 |
19+
| 26.1 | 支持，积极开发 |
20+
| 1.21.11 | 支持，积极开发 |
2021
| 1.21.5 | 支持，积极开发 |
2122
| 1.21 | 支持，积极开发 |
2223
| 1.20.4 | 支持，积极开发 |
2324
| 1.20.1 | 不支持，停止维护（在`2025/6/18`停止维护） |
2425
| 1.19.3 | 不支持，停止维护（在`2025/6/18`停止维护） |
2526
| 1.18.2 | 不支持，停止维护（在`2025/6/18`停止维护） |
26-
| 1.17.1 | 支持，积极开发 |
27+
| 1.17.1 | 不支持，停止维护（在`2026/5/1`停止维护） |
2728
| 1.16.5 | 不支持，停止维护（在`2023/1/8`停止维护） |
2829

2930
## 规则

‎settings.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ plugins {
1616

1717
stonecutter {
1818
create(rootProject) {
19-
versions("1.21", "1.21.5", "1.21.10").buildscript("build.gradle.kts")
20-
// version("26.1").buildscript("unobfuscated.gradle.kts")
21-
vcsVersion = "1.21.5"
19+
versions("1.21", "1.21.5", "1.21.11").buildscript("build.gradle.kts")
20+
version("26.1").buildscript("unobfuscated.gradle.kts")
21+
vcsVersion = "26.1"
2222
}
2323
}

‎src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
import io.github.optijava.opt_carpet_addition.utils.ConfigUtil;
1414
import io.github.optijava.opt_carpet_addition.utils.TpLimit;
1515
import net.fabricmc.api.ModInitializer;
16-
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
16+
//? if > 1.21.11 {
17+
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
18+
//?} else {
19+
/*import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
20+
*///?}
1721
import net.minecraft.commands.CommandBuildContext;
1822
import net.minecraft.commands.CommandSourceStack;
1923
import net.minecraft.server.level.ServerPlayer;
@@ -33,8 +37,11 @@ public class OptCarpetAddition implements CarpetExtension, ModInitializer {
3337
public void onInitialize() {
3438
LOGGER.info("OptCarpetAddition is loading...");
3539
CarpetServer.manageExtension(this);
36-
37-
ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(new FixExperienceBug());
40+
//? if > 1.21.11 {
41+
ServerEntityLevelChangeEvents.AFTER_PLAYER_CHANGE_LEVEL.register(new FixExperienceBug());
42+
//?} else {
43+
/*ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(new FixExperienceBug());
44+
*///?}
3845
}
3946

4047
@Override

‎src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,10 @@ public class OptCarpetSettings {
178178
public static boolean enableLoggerCommand = true;
179179

180180
@Rule(
181-
categories = {RuleCategory.COMMAND , OCA}
181+
categories = {RuleCategory.COMMAND , OCA},
182+
options = {"true", "false", "1", "2", "3", "4"}
182183
)
183-
public static boolean enableCrashCommand = true;
184+
public static String enableCrashCommand = FALSE;
184185

185186
@Rule(
186187
categories = {RuleCategory.COMMAND , OCA}

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/CrashCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ private CrashCommand() {
1818

1919
public static void registerCommand(CommandDispatcher<CommandSourceStack> dispatcher) {
2020
LiteralArgumentBuilder<CommandSourceStack> argumentBuilder = Commands.literal("crash")
21-
.requires((CommandSourceStack -> CommandSourceStack.hasPermission(4)))
2221
.requires((player) -> carpet.utils.CommandHelper.canUseCommand(player, enableCrashCommand))
2322
.executes(CrashCommand::prepare)
2423
.then(

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ private static int listAdvance(CommandContext<CommandSourceStack> context) {
2626
sb.append("\n");
2727
minecraftServer.getPlayerList().getPlayers().forEach(s -> {
2828
//? if >= 1.21.10 {
29-
/*sb.append(s.getName().getString()).append(" ").append(s.gameMode().getName()).append(" ").append(s.connection.latency()).append("ms ").append(s.getIpAddress()).append(" ").append(s.getGameProfile().id().toString()).append("\n");
30-
*///?} else if >= 1.21.5 {
31-
sb.append(s.getName().getString()).append(" ").append(s.gameMode).append(" ").append(s.connection.latency()).append("ms ").append(s.getIpAddress()).append(" ").append(s.getGameProfile().getId().toString()).append("\n");
32-
//?}
29+
sb.append(s.getName().getString()).append(" ").append(s.gameMode().getName()).append(" ").append(s.connection.latency()).append("ms ").append(s.getIpAddress()).append(" ").append(s.getGameProfile().id().toString()).append("\n");
30+
//?} else if >= 1.21.5 {
31+
/*sb.append(s.getName().getString()).append(" ").append(s.gameMode).append(" ").append(s.connection.latency()).append("ms ").append(s.getIpAddress()).append(" ").append(s.getGameProfile().getId().toString()).append("\n");
32+
*///?}
3333
});
3434
Messenger.m(context.getSource(), sb.toString());
3535
} catch (Exception e) {

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/PlayerTpCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ private static int teleport(CommandContext<CommandSourceStack> context) {
8181

8282
try {
8383
//? if >= 1.21.10 {
84-
//final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().name();
84+
final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().name();
8585
//?} else {
86-
final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().getName();
87-
//?}
86+
/*final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().getName();
87+
*///?}
8888

8989
if (server.getPlayerList().getPlayerByName(target) instanceof EntityPlayerMPFake) {
9090

@@ -168,10 +168,10 @@ private static int teleportHere(CommandContext<CommandSourceStack> context) {
168168

169169
try {
170170
//? if >= 1.21.10 {
171-
//final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().name();
171+
final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().name();
172172
//?} else {
173-
final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().getName();
174-
//?}
173+
/*final String commandSourcePlayerName = Objects.requireNonNull(context.getSource().getPlayer()).getGameProfile().getName();
174+
*///?}
175175

176176
if (server.getPlayerList().getPlayerByName(target) instanceof EntityPlayerMPFake) {
177177

‎src/main/java/io/github/optijava/opt_carpet_addition/events/fixExperienceBug/FixExperienceBug.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
package io.github.optijava.opt_carpet_addition.events.fixExperienceBug;
22

33
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
4-
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
4+
//? if > 1.21.11 {
5+
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
6+
//?} else {
7+
/*import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
8+
*///?}
59
import net.minecraft.server.level.ServerLevel;
610
import net.minecraft.server.level.ServerPlayer;
711

8-
public class FixExperienceBug implements ServerEntityWorldChangeEvents.AfterPlayerChange {
12+
//? if > 1.21.11 {
13+
public class FixExperienceBug implements ServerEntityLevelChangeEvents.AfterPlayerChange {
914
@Override
10-
public void afterChangeWorld(ServerPlayer player, ServerLevel origin, ServerLevel destination) {
15+
public void afterChangeLevel(ServerPlayer player, ServerLevel origin, ServerLevel destination) {
1116
if (OptCarpetSettings.fixXpLevelBug) {
1217
// refresh player's experience bar
1318
player.giveExperiencePoints(0);
1419
}
1520
}
1621
}
22+
//?} else {
23+
//public class FixExperienceBug implements ServerEntityWorldChangeEvents.AfterPlayerChange {
24+
// @Override
25+
// public void afterChangeWorld(ServerPlayer player, ServerLevel origin, ServerLevel destination) {
26+
// if (OptCarpetSettings.fixXpLevelBug) {
27+
// // refresh player's experience bar
28+
// player.giveExperiencePoints(0);
29+
// }
30+
// }
31+
//}
32+
//?}

‎src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/disabledLayEggs/ChickenEntity_Mixin.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package io.github.optijava.opt_carpet_addition.mixins.rule.disabledLayEggs;
22

33
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
4-
import net.minecraft.world.entity.animal.Chicken;
4+
//? if >= 1.21.11 {
5+
import net.minecraft.world.entity.animal.chicken.Chicken;
6+
//?} else {
7+
/*import net.minecraft.world.entity.animal.Chicken;
8+
*///?}
59
import org.spongepowered.asm.mixin.Mixin;
610
import org.spongepowered.asm.mixin.injection.At;
711
import org.spongepowered.asm.mixin.injection.Inject;

0 commit comments

Comments
 (0)