Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00
Code Issues Releases Activity

Revert stupid change

Browse Source
This commit is contained in:
Lumine1909
2025-11-27 05:58:40 -08:00
parent d073e2a463
commit a23015d479
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
leaves-server/src/main/java/org/leavesmc/leaves/command/arguments/BotArgumentType.java
View File

@@ -41,7 +41,7 @@ public class BotArgumentType implements CustomArgumentType.Converted<@NotNull Se
if (bot == null) {
throw new CommandSyntaxException(
CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownArgument(),
Component.literal("Bot with fullName '" + nativeType + "' does not exist")
Component.literal("Bot with name '" + nativeType + "' does not exist")
);
}
return bot;

4
leaves-server/src/main/java/org/leavesmc/leaves/command/bot/subcommands/CreateCommand.java
View File

@@ -75,7 +75,7 @@ public class CreateCommand extends BotSubcommand {
private static boolean canCreate(CommandSender sender, @NotNull String name) {
BotList botList = BotList.INSTANCE;
if (!name.matches("^[a-zA-Z0-9_]{4,16}$")) {
sender.sendMessage(text("This fullName is illegal, bot fullName must be 4-16 characters and contain only letters, numbers, and underscores.", NamedTextColor.RED));
sender.sendMessage(text("This name is illegal, bot name must be 4-16 characters and contain only letters, numbers, and underscores.", NamedTextColor.RED));
return false;
}
@@ -85,7 +85,7 @@ public class CreateCommand extends BotSubcommand {
}
if (LeavesConfig.modify.fakeplayer.unableNames.contains(name)) {
sender.sendMessage(text("This fullName is not allowed in this server", NamedTextColor.RED));
sender.sendMessage(text("This name is not allowed in this server", NamedTextColor.RED));
return false;
}

2
leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBot.java
View File

@@ -101,6 +101,6 @@ public class CraftBot extends CraftPlayer implements Bot {
@Override
public String toString() {
return "CraftBot{" + "fullName=" + getName() + '}';
return "CraftBot{" + "name=" + getName() + '}';
}
}

2
leaves-server/src/main/java/org/leavesmc/leaves/entity/photographer/CraftPhotographer.java
View File

@@ -68,6 +68,6 @@ public class CraftPhotographer extends CraftPlayer implements Photographer {
@Override
public String toString() {
return "CraftPhotographer{" + "fullName=" + getName() + '}';
return "CraftPhotographer{" + "name=" + getName() + '}';
}
}

2
leaves-server/src/main/java/org/leavesmc/leaves/plugin/provider/configuration/MixinConfiguration.java
View File

@@ -19,7 +19,7 @@ public class MixinConfiguration {
return;
}
if (packageName == null) {
throw new IllegalStateException("Already define mixins: " + mixins + ", but no mixin package-fullName provided");
throw new IllegalStateException("Already define mixins: " + mixins + ", but no mixin package-name provided");
}
}

2
leaves-server/src/main/java/org/leavesmc/leaves/profile/LeavesMinecraftSessionService.java
View File

@@ -53,7 +53,7 @@ public class LeavesMinecraftSessionService extends PaperMinecraftSessionService
ServerPlayer player = MinecraftServer.getServer().getPlayerList().getPlayerByName(profileName);
if (player != null && !(player instanceof ServerBot)) {
return null; // if it has same fullName, return null
return null; // if it has same name, return null
}
if (LeavesConfig.mics.yggdrasil.enable && result == null) {

2
leaves-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SubRegionPlacementModification.java
View File

@@ -60,6 +60,6 @@ public class SubRegionPlacementModification {
@Override
public String toString() {
return String.format("[fullName=%s, position=%s, rotation=%s, mirror=%s]", name, position, rotation, mirror);
return String.format("[name=%s, position=%s, rotation=%s, mirror=%s]", name, position, rotation, mirror);
}
}

4
leaves-server/src/main/java/org/leavesmc/leaves/region/linear/LinearRegionFile.java
View File

@@ -360,10 +360,10 @@ public class LinearRegionFile implements IRegionFile {
regionX = Integer.parseInt(parts[1]);
regionZ = Integer.parseInt(parts[2]);
} else {
LOGGER.warn("Unexpected file fullName format: {}", fileName);
LOGGER.warn("Unexpected file name format: {}", fileName);
}
} catch (NumberFormatException e) {
LOGGER.error("Failed to parse region coordinates from file fullName: {}", fileName, e);
LOGGER.error("Failed to parse region coordinates from file name: {}", fileName, e);
}
dataStream.writeInt(regionX);