fixing some merge stuff
This commit is contained in:
parent
01f12e3efa
commit
8828275a4d
@ -14,13 +14,15 @@ import io.github.flemmli97.flan.config.Config;
|
|||||||
import io.github.flemmli97.flan.config.ConfigHandler;
|
import io.github.flemmli97.flan.config.ConfigHandler;
|
||||||
import io.github.flemmli97.flan.platform.ClaimPermissionCheck;
|
import io.github.flemmli97.flan.platform.ClaimPermissionCheck;
|
||||||
import io.github.flemmli97.flan.platform.CrossPlatformStuff;
|
import io.github.flemmli97.flan.platform.CrossPlatformStuff;
|
||||||
import io.github.flemmli97.flan.platform.integration.dynmap.DynmapCalls;
|
import io.github.flemmli97.flan.platform.integration.webmap.WebmapCalls;
|
||||||
|
import io.github.flemmli97.flan.player.DisplayBox;
|
||||||
import io.github.flemmli97.flan.player.LogoutTracker;
|
import io.github.flemmli97.flan.player.LogoutTracker;
|
||||||
import io.github.flemmli97.flan.player.PlayerClaimData;
|
import io.github.flemmli97.flan.player.PlayerClaimData;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.MutableComponent;
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import net.minecraft.network.chat.Style;
|
||||||
import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
|
import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
|
||||||
import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
|
import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
@ -35,6 +37,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
|
|||||||
import net.minecraft.world.level.levelgen.Heightmap;
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
import net.minecraft.world.phys.AABB;
|
import net.minecraft.world.phys.AABB;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -585,10 +588,10 @@ public class Claim implements IPermissionContainer {
|
|||||||
if (ConfigHandler.config.claimDisplayActionBar) {
|
if (ConfigHandler.config.claimDisplayActionBar) {
|
||||||
if (subtitle != null) {
|
if (subtitle != null) {
|
||||||
MutableComponent message = title.copy().append(Component.literal(" | ").setStyle(Style.EMPTY.withColor(ChatFormatting.WHITE))).append(subtitle);
|
MutableComponent message = title.copy().append(Component.literal(" | ").setStyle(Style.EMPTY.withColor(ChatFormatting.WHITE))).append(subtitle);
|
||||||
player.sendSystemMessage(message, ChatType.GAME_INFO);
|
player.displayClientMessage(message, true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
player.sendSystemMessage(title, ChatType.GAME_INFO);
|
player.displayClientMessage(title, true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
player.connection.send(new ClientboundSetTitleTextPacket(title));
|
player.connection.send(new ClientboundSetTitleTextPacket(title));
|
||||||
|
@ -14,8 +14,10 @@ import io.github.flemmli97.flan.api.data.IPlayerData;
|
|||||||
import io.github.flemmli97.flan.api.permission.ClaimPermission;
|
import io.github.flemmli97.flan.api.permission.ClaimPermission;
|
||||||
import io.github.flemmli97.flan.api.permission.PermissionRegistry;
|
import io.github.flemmli97.flan.api.permission.PermissionRegistry;
|
||||||
import io.github.flemmli97.flan.config.ConfigHandler;
|
import io.github.flemmli97.flan.config.ConfigHandler;
|
||||||
import io.github.flemmli97.flan.platform.integration.dynmap.DynmapCalls;
|
import io.github.flemmli97.flan.platform.integration.claiming.OtherClaimingModCheck;
|
||||||
import io.github.flemmli97.flan.platform.integration.permissions.PermissionNodeHandler;
|
import io.github.flemmli97.flan.platform.integration.permissions.PermissionNodeHandler;
|
||||||
|
import io.github.flemmli97.flan.platform.integration.webmap.WebmapCalls;
|
||||||
|
import io.github.flemmli97.flan.player.DisplayBox;
|
||||||
import io.github.flemmli97.flan.player.EnumDisplayType;
|
import io.github.flemmli97.flan.player.EnumDisplayType;
|
||||||
import io.github.flemmli97.flan.player.EnumEditMode;
|
import io.github.flemmli97.flan.player.EnumEditMode;
|
||||||
import io.github.flemmli97.flan.player.OfflinePlayerData;
|
import io.github.flemmli97.flan.player.OfflinePlayerData;
|
||||||
|
Loading…
Reference in New Issue
Block a user