Skip to content

Commit ceb7b9e

Browse files
committed
Totally unnecessary changes
1 parent 21cf406 commit ceb7b9e

13 files changed

+97
-652
lines changed

.editorconfig

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
root = true
2-
31
[*]
4-
charset = utf-8
5-
end_of_line = lf
6-
insert_final_newline = true
7-
indent_style = space
8-
indent_size = 4
2+
charset=utf-8
3+
end_of_line=lf
4+
insert_final_newline=true
5+
indent_style=space
6+
indent_size=4
7+
8+
[*.tiny]
9+
indent_style=tab
910

11+
[*.bat]
12+
end_of_line=crlf

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
* text=auto
2+
3+
*.sh text eol=lf
24
gradlew text eol=lf
35
*.bat text eol=crlf
6+
47
*.jar binary

build.gradle

+7-2
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,22 @@ dependencies {
4242

4343
// PlaceholderAPI
4444
compileOnly "me.clip:placeholderapi:2.10.10"
45+
46+
// FastBoard API
47+
implementation "fr.mrmicky:fastboard:1.2.1"
4548
}
4649

4750
java {
4851
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
4952
}
5053

5154
tasks.withType(JavaCompile) {
52-
options.encoding = 'UTF-8'
55+
options.encoding = "UTF-8"
56+
options.release.set(17)
5357
}
5458

5559
shadowJar {
56-
archiveFileName = "EternalCore v${project.version} (MC 1.13-1.18).jar"
60+
archiveFileName = "EternalCore v${project.version} (MC 1.13-1.18x).jar"
5761

5862
exclude "org/intellij/lang/annotations/**"
5963
exclude "org/jetbrains/annotations/**"
@@ -63,4 +67,5 @@ shadowJar {
6367
relocate "org.bstats", "com.eternalcode.core.libs.org.bstats"
6468
relocate "panda", "com.eternalcode.core.libs.panda"
6569
relocate "org.panda_lang", "com.eternalcode.core.libs.panda"
70+
relocate "fr.mrmicky.fastboard", "com.eternalcode.core.libs.fastboard"
6671
}

src/main/java/com/eternalcode/core/EternalCore.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.eternalcode.core.command.implementations.SkullCommand;
2929
import com.eternalcode.core.command.implementations.SpeedCommand;
3030
import com.eternalcode.core.command.implementations.StonecutterCommand;
31+
import com.eternalcode.core.command.implementations.TeleportCommand;
3132
import com.eternalcode.core.command.implementations.WhoIsCommand;
3233
import com.eternalcode.core.command.implementations.WorkbenchCommand;
3334
import com.eternalcode.core.configuration.ConfigurationManager;
@@ -79,12 +80,12 @@ public void onEnable() {
7980

8081
this.configurationManager = new ConfigurationManager(this);
8182
this.configurationManager.loadConfigs();
82-
MessagesConfiguration messagesConfiguration = configurationManager.getMessagesConfiguration();
83+
MessagesConfiguration config = configurationManager.getMessagesConfiguration();
8384

8485
// bStats metrics
8586
// TODO: Jakieś ładne custom charty
86-
//Metrics metrics = new Metrics(this, 13026);
87-
//metrics.addCustomChart(new SingleLineChart("users", () -> 0));
87+
// Metrics metrics = new Metrics(this, 13026);
88+
// metrics.addCustomChart(new SingleLineChart("users", () -> 0));
8889

8990
// Services
9091
this.userService = new UserService();
@@ -94,7 +95,7 @@ public void onEnable() {
9495
.bind(resources -> resources.on(ConfigurationManager.class).assignInstance(configurationManager))
9596
.bind(new CommandInfoBind())
9697
.registerDefaultComponents()
97-
.permissionHandler((message, permission) -> message.getCommandSender().sendMessage(ChatUtils.color(messagesConfiguration.permissionMessage.replace("{PERMISSION}", permission))))
98+
.permissionHandler((message, permission) -> message.getCommandSender().sendMessage(ChatUtils.color(config.permissionMessage.replace("{PERMISSION}", permission))))
9899
.commands(
99100
AlertCommand.class,
100101
AnvilCommand.class,
@@ -120,7 +121,8 @@ public void onEnable() {
120121
WhoIsCommand.class,
121122
WorkbenchCommand.class,
122123
EternalCoreCommand.class,
123-
ScoreboardCommand.class
124+
ScoreboardCommand.class,
125+
TeleportCommand.class
124126
).install();
125127

126128
// Register events

src/main/java/com/eternalcode/core/command/implementations/EnderchestCommand.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public void execute(Player player, String[] args) {
3636
Inventory otherInventory = other.getEnderChest();
3737
player.openInventory(otherInventory);
3838
player.sendMessage(ChatUtils.color(config.enderchestGuiOpenPlayerMessage + other.getName()));
39-
}).onEmpty(() -> {
40-
player.openInventory(player.getEnderChest());
41-
});
39+
}).onEmpty(() -> player.openInventory(player.getEnderChest()));
4240
}
4341
}

src/main/java/com/eternalcode/core/command/implementations/HatCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void execute(Player player) {
3535
ItemStack itemStack = playerInventory.getHelmet();
3636
ItemStack handItem = playerInventory.getItem(playerInventory.getHeldItemSlot());
3737
if (itemStack == null || itemStack.getType() == Material.AIR) {
38-
playerInventory.remove(handItem);
3938
playerInventory.setHelmet(handItem);
39+
playerInventory.remove(handItem);
4040
return;
4141
}
4242
player.sendMessage(ChatUtils.color(config.nullHatMessage));

src/main/java/com/eternalcode/core/command/implementations/SkullCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public final class SkullCommand {
2727
playerOnly = true,
2828
acceptsExceeded = true
2929
)
30-
public void execute(EternalCore plugin, Player player, String[] args, CommandInfo commandInfo) {
30+
public void execute(EternalCore eternalCore, Player player, String[] args, CommandInfo commandInfo) {
3131
when(args.length != 1, commandInfo.getUsageMessage());
32-
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
32+
Bukkit.getScheduler().runTaskAsynchronously(eternalCore, () -> {
3333
ItemStack item = new ItemBuilder(Material.PLAYER_HEAD)
3434
.displayName(args[0])
3535
.skullOwner(args[0])
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.eternalcode.core.command.implementations;
2+
3+
import com.eternalcode.core.EternalCore;
4+
import com.eternalcode.core.configuration.ConfigurationManager;
5+
import com.eternalcode.core.configuration.MessagesConfiguration;
6+
import com.eternalcode.core.utils.ChatUtils;
7+
import net.dzikoysk.funnycommands.commands.CommandInfo;
8+
import net.dzikoysk.funnycommands.stereotypes.FunnyCommand;
9+
import net.dzikoysk.funnycommands.stereotypes.FunnyComponent;
10+
import org.bukkit.Bukkit;
11+
import org.bukkit.entity.Player;
12+
13+
import static com.eternalcode.core.command.Valid.when;
14+
15+
@FunnyComponent
16+
public final class TeleportCommand {
17+
private final ConfigurationManager configurationManager;
18+
19+
public TeleportCommand(ConfigurationManager configurationManager) {
20+
this.configurationManager = configurationManager;
21+
}
22+
23+
@FunnyCommand(
24+
name = "teleport",
25+
aliases = "tp",
26+
permission = "eternalcore.command.teleport",
27+
usage = "&8» &cPoprawne użycie &7/teleport <player>",
28+
acceptsExceeded = true
29+
)
30+
31+
public void execute(EternalCore eternalCore, Player player, String[] args, CommandInfo commandInfo) {
32+
MessagesConfiguration config = configurationManager.getMessagesConfiguration();
33+
when(args.length != 1, commandInfo.getUsageMessage());
34+
Player targetPlayer = Bukkit.getPlayer(args[0]);
35+
if (targetPlayer != null) {
36+
Bukkit.getScheduler().runTaskAsynchronously(eternalCore, () -> player.teleport(targetPlayer));
37+
return;
38+
}
39+
40+
player.sendMessage(ChatUtils.color(config.offlinePlayer));
41+
}
42+
}
43+

src/main/java/com/eternalcode/core/listeners/PlayerChatListener.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@ public class PlayerChatListener implements Listener {
1919
@EventHandler
2020
public void onPlayerChat(AsyncChatEvent event) {
2121
if (ChatCommand.chatMuted && !event.getPlayer().hasPermission("eternalcore.chat.bypass")) {
22-
event.setCancelled(true);
2322
event.getPlayer().sendMessage(ChatUtils.color("Chat jest obecnie wyłączony"));
24-
return;
25-
}
26-
}
27-
28-
@EventHandler
29-
public void onPlayerKick(PlayerKickEvent event) {
30-
if (event.reason().contains(Component.text("disconnect.spam"))) {
3123
event.setCancelled(true);
24+
return;
3225
}
3326
}
3427

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.eternalcode.core.listeners;
2+
3+
import net.kyori.adventure.text.Component;
4+
import org.bukkit.event.EventHandler;
5+
import org.bukkit.event.Listener;
6+
import org.bukkit.event.player.PlayerKickEvent;
7+
8+
public class PlayerKickListener implements Listener {
9+
@EventHandler
10+
public void onPlayerKick(PlayerKickEvent event) {
11+
if (event.reason().contains(Component.text("disconnect.spam"))) {
12+
event.setCancelled(true);
13+
}
14+
}
15+
}

0 commit comments

Comments
 (0)