3 Commits

Author SHA1 Message Date
3c674c23fc Fix VelocityCore
All checks were successful
SteamWarCI Build successful
2025-10-03 12:52:43 +02:00
e1633d7c47 Update VelocityCore to use Linkage 2025-10-03 12:52:43 +02:00
d635c3a456 Add Linkage to CommonCore and implement SpigotLinker used in BauSystem 2025-10-03 12:52:43 +02:00
96 changed files with 532 additions and 274 deletions

View File

@@ -38,41 +38,29 @@ import de.steamwar.bausystem.utils.TickListener;
import de.steamwar.bausystem.utils.TickManager;
import de.steamwar.bausystem.worlddata.WorldData;
import de.steamwar.command.AbstractValidator;
import de.steamwar.command.SWCommand;
import de.steamwar.command.SWCommandUtils;
import de.steamwar.core.CRIUSleepEvent;
import de.steamwar.core.Core;
import de.steamwar.core.WorldEditRendererCUIEditor;
import de.steamwar.linkage.LinkedInstance;
import de.steamwar.linkage.MaxVersion;
import de.steamwar.linkage.MinVersion;
import de.steamwar.linkage.PluginCheck;
import de.steamwar.linkage.api.Disable;
import de.steamwar.linkage.api.Enable;
import de.steamwar.linkage.AbstractLinker;
import de.steamwar.linkage.SpigotLinker;
import de.steamwar.message.Message;
import de.steamwar.network.packets.PacketHandler;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
import java.io.*;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.stream.Collectors;
public class BauSystem extends JavaPlugin implements Listener {
@@ -83,7 +71,7 @@ public class BauSystem extends JavaPlugin implements Listener {
@Getter
private static BauSystem instance;
private final Map<Class<?>, Object> instances = new HashMap<>();
private SpigotLinker linker;
@Override
public void onEnable() {
@@ -96,115 +84,43 @@ public class BauSystem extends JavaPlugin implements Listener {
SWUtils.setBausystem(instance);
RegionSystem.INSTANCE.load();
/*
try {
PrototypeLoader.load();
RegionLoader.load();
} catch (SecurityException e) {
Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
Bukkit.shutdown();
System.exit(1);
return;
}
new Updater(PrototypeLoader.file, PrototypeLoader::load);
new Updater(RegionLoader.file, RegionLoader::load);
*/
SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
instances.put(BauServer.class, BauServer.getInstance());
List<Class<?>> classes = new BufferedReader(new InputStreamReader(BauSystem.class.getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
.lines()
.map(s -> {
try {
return Class.forName(s, false, BauSystem.class.getClassLoader());
} catch (ClassNotFoundException | NoClassDefFoundError e) {
if (e.getMessage().equals(s)) {
Bukkit.shutdown();
throw new SecurityException(e.getMessage(), e);
}
return null;
}
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
classes.forEach(clazz -> {
MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
if (minVersion != null && Core.getVersion() < minVersion.value()) {
return;
}
if (maxVersion != null && Core.getVersion() > maxVersion.value()) {
return;
}
for (PluginCheck pluginCheck : pluginChecks) {
if (pluginCheck.has() == PluginCheck.Has.THIS && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) != null) {
continue;
linker = new SpigotLinker(BauSystem.getInstance(), BauSystem.MESSAGE) {
@Override
protected void linkObject(Object any) {
super.linkObject(any);
if (any instanceof LuaLib) {
SteamWarLuaPlugin.add((LuaLib) any);
}
if (pluginCheck.has() == PluginCheck.Has.NOT && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) == null) {
continue;
if (any instanceof ScoreboardElement) {
BauScoreboard.addElement((ScoreboardElement) any);
}
return;
}
Object any;
try {
any = clazz.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
getLogger().log(Level.SEVERE, e.getMessage(), e);
Bukkit.shutdown();
throw new SecurityException(e.getMessage());
}
instances.put(clazz, any);
if (any instanceof Enable) {
((Enable) any).enable();
}
if (any instanceof SWCommand) {
((SWCommand) any).setMessage(BauSystem.MESSAGE);
}
if (any instanceof Listener) {
Bukkit.getPluginManager().registerEvents((Listener) any, BauSystem.getInstance());
}
if (any instanceof PacketHandler) {
((PacketHandler) any).register();
}
if (any instanceof LuaLib) {
SteamWarLuaPlugin.add((LuaLib) any);
}
if (any instanceof ScoreboardElement) {
BauScoreboard.addElement((ScoreboardElement) any);
}
if (any instanceof BauGuiItem) {
BauGUI.addItem((BauGuiItem) any);
}
if (any instanceof PanzernAlgorithm) {
Panzern.add((PanzernAlgorithm) any);
}
if (any instanceof ConfigConverter) {
Config.addConfigConverter((ConfigConverter) any);
}
if (any instanceof BoundingBoxLoader) {
((BoundingBoxLoader) any).load();
}
});
instances.forEach((clazz, o) -> {
for (Field field : clazz.getFields()) {
if (field.getAnnotation(LinkedInstance.class) != null) {
try {
field.set(o, instances.get(field.getType()));
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
if (any instanceof BauGuiItem) {
BauGUI.addItem((BauGuiItem) any);
}
if (any instanceof PanzernAlgorithm) {
Panzern.add((PanzernAlgorithm) any);
}
if (any instanceof ConfigConverter) {
Config.addConfigConverter((ConfigConverter) any);
}
if (any instanceof BoundingBoxLoader) {
((BoundingBoxLoader) any).load();
}
}
});
};
try {
linker.addLinkableInstance(BauServer.getInstance());
linker.link();
} catch (AbstractLinker.LinkException e) {
getLogger().log(Level.SEVERE, "Could not link a class.", e);
Bukkit.shutdown();
}
TickListener.impl.init();
@@ -221,15 +137,7 @@ public class BauSystem extends JavaPlugin implements Listener {
@Override
public void onDisable() {
instances.forEach((aClass, o) -> {
if (o instanceof Listener) {
HandlerList.unregisterAll((Listener) o);
}
if (o instanceof Disable) {
((Disable) o).disable();
}
});
linker.unlink();
WorldData.write();
RegionSystem.INSTANCE.save();
Config.getInstance().saveAll();

View File

@@ -26,7 +26,6 @@ import de.steamwar.bausystem.linkage.specific.BauGuiItem;
import de.steamwar.bausystem.region.FlagOptional;
import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.core.Core;
import de.steamwar.inventory.SWItem;
import de.steamwar.linkage.Linked;
import de.steamwar.sql.SteamwarUser;

View File

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.region.Region;
import de.steamwar.core.TrickyTrialsWrapper;
import de.steamwar.linkage.Linked;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent;

View File

@@ -25,8 +25,6 @@ import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.RegionUtils;
import de.steamwar.bausystem.region.flags.ColorMode;
import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.utils.RegionExtensionType;
import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.bausystem.utils.PasteBuilder;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;

View File

@@ -23,12 +23,9 @@ import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.utils.ScoreboardElement;
import de.steamwar.linkage.Linked;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.util.List;
import java.util.Optional;
@Linked
public class RegionScoreboardElement implements ScoreboardElement {

View File

@@ -25,7 +25,6 @@ import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.RegionUtils;
import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.utils.RegionExtensionType;
import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.bausystem.utils.PasteBuilder;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;

View File

@@ -25,8 +25,6 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.utils.RegionExtensionType;
import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.core.TrickyTrialsWrapper;
import de.steamwar.linkage.Linked;
import org.bukkit.Bukkit;

View File

@@ -34,16 +34,12 @@ import de.steamwar.linkage.LinkedInstance;
import de.steamwar.techhider.TechHider;
import net.md_5.bungee.api.ChatMessageType;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;

View File

@@ -28,7 +28,6 @@ import de.steamwar.linkage.Linked;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionEffectType;

View File

@@ -0,0 +1,26 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
plugins {
steamwar.java
}
dependencies {
compileOnly(libs.classindex)
}

View File

@@ -0,0 +1,163 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.linkage;
import de.steamwar.linkage.api.Disable;
import de.steamwar.linkage.api.Enable;
import lombok.NonNull;
import lombok.experimental.StandardException;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
public abstract class AbstractLinker<T> {
protected final T plugin;
private Map<Class<?>, Object> instances = new HashMap<>();
protected AbstractLinker(@NonNull T plugin) {
this.plugin = plugin;
instances.put(plugin.getClass(), plugin);
}
@StandardException
public static class LinkException extends Exception {
}
public final void link() throws LinkException {
List<Class<?>> classes;
try {
classes = new BufferedReader(new InputStreamReader(plugin.getClass().getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
.lines()
.map(s -> {
try {
return Class.forName(s, false, plugin.getClass().getClassLoader());
} catch (ClassNotFoundException | NoClassDefFoundError e) {
throw new SecurityException(e.getMessage(), e);
}
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
} catch (SecurityException e) {
Throwable cause = e.getCause();
throw new LinkException(cause.getMessage(), cause);
}
try {
classes.forEach(clazz -> {
MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
if (!versionCheck(clazz, minVersion, maxVersion)) return;
EventMode eventMode = clazz.getAnnotation(EventMode.class);
if (!eventModeCheck(clazz, eventMode)) return;
PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
for (PluginCheck pluginCheck : pluginChecks) {
if (!pluginCheck(clazz, pluginCheck)) return;
}
Object any;
try {
any = clazz.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
throw new SecurityException(e.getMessage(), e);
}
instances.put(clazz, any);
if (any instanceof Enable) {
((Enable) any).enable();
}
linkObject(any);
});
} catch (SecurityException e) {
Throwable cause = e.getCause();
throw new LinkException(cause.getMessage(), cause);
}
try {
instances.forEach((clazz, o) -> {
for (Field field : clazz.getFields()) {
if (field.getAnnotation(LinkedInstance.class) != null) {
System.out.println("Setting " + field.getName() + " to " + instances.get(field.getType()));
try {
field.set(o, instances.get(field.getType()));
} catch (IllegalAccessException e) {
throw new SecurityException(e.getMessage(), e);
}
}
}
});
} catch (SecurityException e) {
Throwable cause = e.getCause();
throw new LinkException(cause.getMessage(), cause);
}
}
public final void unlink() {
instances.forEach((aClass, any) -> {
unlinkObject(any);
if (any instanceof Disable) {
((Disable) any).disable();
}
});
}
public final void addLinkableInstance(@NonNull Object instance) {
instances.put(instance.getClass(), instance);
}
/**
* @return {@code true} if the clazz passes the checks {@code false} otherwise
*/
protected boolean versionCheck(@NonNull Class<?> clazz, MinVersion minVersion, MaxVersion maxVersion) {
return true;
}
/**
* @return {@code true} if the clazz passes the checks {@code false} otherwise
*/
protected boolean pluginCheck(@NonNull Class<?> clazz, PluginCheck pluginCheck) {
return true;
}
/**
* @return {@code true} if the clazz passes the checks {@code false} otherwise
*/
protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
return true;
}
/**
* There is no need in calling {@link Enable#enable()} by this method.
*/
protected void linkObject(Object any) {
}
/**
* There is no need in calling {@link Disable#disable()} ()} by this method.
*/
protected void unlinkObject(Object any) {
}
}

View File

@@ -1,7 +1,7 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -17,21 +17,15 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.linkage.specific;
package de.steamwar.linkage;
import de.steamwar.bausystem.region.Region;
import org.bukkit.entity.Player;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
public interface ScoreboardItem {
/**
* Returns one Scoreboard line. If {@code null} result will be ignored.
* If return value contains {@code '?'} it will be replaced to the color
* code of the current {@link Region}.
*
* @param player the player to create the scoreboard line for
* @param region the region the player is in
* @return the String to send, can be {@code null}
*/
String getString(Player player, Region region);
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
public @interface EventMode {
boolean value();
}

View File

@@ -25,4 +25,5 @@ dependencies {
api(project(":CommonCore:SQL"))
api(project(":CommonCore:Network"))
api(project(":CommonCore:Data"))
api(project(":CommonCore:Linkage"))
}

View File

@@ -0,0 +1,82 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.linkage;
import de.steamwar.command.SWCommand;
import de.steamwar.core.Core;
import de.steamwar.message.Message;
import de.steamwar.network.packets.PacketHandler;
import lombok.NonNull;
import org.bukkit.Bukkit;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin;
public class SpigotLinker extends AbstractLinker<JavaPlugin> {
private final Message message;
public SpigotLinker(@NonNull JavaPlugin plugin, Message message) {
super(plugin);
this.message = message;
}
@Override
protected boolean versionCheck(@NonNull Class<?> clazz, MinVersion minVersion, MaxVersion maxVersion) {
if (minVersion != null && Core.getVersion() < minVersion.value()) {
return false;
}
if (maxVersion != null && Core.getVersion() > maxVersion.value()) {
return false;
}
return true;
}
@Override
protected boolean pluginCheck(@NonNull Class<?> clazz, PluginCheck pluginCheck) {
if (pluginCheck.has() == PluginCheck.Has.THIS && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) != null) {
return true;
}
if (pluginCheck.has() == PluginCheck.Has.NOT && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) == null) {
return true;
}
return false;
}
@Override
protected void linkObject(Object any) {
if (any instanceof SWCommand) {
((SWCommand) any).setMessage(message);
}
if (any instanceof Listener) {
Bukkit.getPluginManager().registerEvents((Listener) any, plugin);
}
if (any instanceof PacketHandler) {
((PacketHandler) any).register();
}
}
@Override
protected void unlinkObject(Object any) {
if (any instanceof Listener) {
HandlerList.unregisterAll((Listener) any);
}
}
}

View File

@@ -32,6 +32,9 @@ java {
}
dependencies {
compileOnly(libs.classindex)
annotationProcessor(libs.classindex)
annotationProcessor(libs.velocityapi)
compileOnly(libs.velocity)
compileOnly(libs.viaapi)

View File

@@ -19,17 +19,21 @@
package de.steamwar.velocitycore;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import java.util.List;
import java.util.concurrent.TimeUnit;
class Broadcaster {
@Linked
@EventMode(false)
public class Broadcaster {
private final List<String> broadcasts = VelocityCore.get().getConfig().getBroadcasts();
private int lastBroadCast = 0;
Broadcaster() {
public Broadcaster() {
if(!broadcasts.isEmpty())
VelocityCore.schedule(this::broadcast).repeat(10, TimeUnit.MINUTES).schedule();
}

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.persistent.Subserver;
@@ -36,6 +37,7 @@ import java.util.concurrent.TimeUnit;
import static de.steamwar.persistent.Storage.eventServer;
@Linked
public class EventStarter {
@Getter

View File

@@ -29,22 +29,24 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.scheduler.Scheduler;
import de.steamwar.command.*;
import de.steamwar.linkage.AbstractLinker;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.LinkedInstance;
import de.steamwar.messages.Chatter;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.persistent.ReloadablePlugin;
import de.steamwar.sql.Punishment;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.Team;
import de.steamwar.sql.UserElo;
import de.steamwar.sql.internal.Statement;
import de.steamwar.velocitycore.commands.*;
import de.steamwar.velocitycore.commands.PunishmentCommand;
import de.steamwar.velocitycore.commands.ServerSwitchCommand;
import de.steamwar.velocitycore.commands.TeamCommand;
import de.steamwar.velocitycore.discord.DiscordBot;
import de.steamwar.velocitycore.discord.DiscordConfig;
import de.steamwar.velocitycore.listeners.*;
import de.steamwar.velocitycore.mods.*;
import de.steamwar.velocitycore.network.handlers.*;
import de.steamwar.velocitycore.tablist.TablistManager;
import de.steamwar.velocitycore.listeners.PollSystem;
import lombok.Getter;
import lombok.NonNull;
import java.nio.file.Path;
import java.sql.Driver;
@@ -94,9 +96,9 @@ public class VelocityCore implements ReloadablePlugin {
@Getter
private Config config;
private ErrorLogger errorLogger;
private TablistManager tablistManager;
@Getter
@LinkedInstance
private TeamCommand teamCommand;
@Inject
@@ -104,9 +106,10 @@ public class VelocityCore implements ReloadablePlugin {
this.proxyServer = proxyServer;
this.logger = logger;
this.dataDirectory = dataDirectory;
}
private AbstractLinker<ReloadablePlugin> linker;
@Subscribe
@Override
public void onProxyInitialization(ProxyInitializeEvent event) {
@@ -139,64 +142,11 @@ public class VelocityCore implements ReloadablePlugin {
initStaticServers();
PollSystem.init();
new Hostname();
new PluginMessage();
new Schematica();
new Badlion();
new FabricModSender();
new ReplayMod();
new FML2();
new ConnectionListener();
new ChatListener();
new BanListener();
new CheckListener();
new IPSanitizer();
new VersionAnnouncer();
new TexturePackSystem();
local = new Node.LocalNode();
if(MAIN_SERVER) {
//new Node.RemoteNode("lx");
}
new TeamchatCommand();
new MsgCommand();
new RCommand();
new PingCommand();
new AlertCommand();
new KickCommand();
new JoinmeCommand();
new TpCommand();
HelpCommand helpCommand = new HelpCommand();
teamCommand = new TeamCommand();
new ServerTeamchatCommand();
new DevCommand();
new SendCommand();
new EventCommand();
new EventreloadCommand();
new EventRescheduleCommand();
new PollCommand();
new BugCommand();
new WhoisCommand();
new RulesCommand();
new IgnoreCommand();
new UnIgnoreCommand();
new PollresultCommand();
new ListCommand();
new StatCommand();
new VerifyCommand();
new GDPRQuery();
new PlaytimeCommand();
new ArenaCommand();
new RankCommand();
new LocalCommand();
new SetLocaleCommand();
new BuilderCloudCommand();
new CheckCommand();
new ModCommand();
// Punishment Commands:
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
new PunishmentCommand("mute", Punishment.PunishmentType.Mute);
@@ -208,32 +158,20 @@ public class VelocityCore implements ReloadablePlugin {
new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServer);
new PunishmentCommand("note", Punishment.PunishmentType.Note);
if(!config.isEventmode()){
new BauCommand(helpCommand);
new WebpasswordCommand();
new FightCommand();
new ChallengeCommand();
new HistoricCommand();
new ReplayCommand();
new Broadcaster();
new CookieEvents();
new StreamingCommand();
}else{
new EventModeListener();
linker = new AbstractLinker<>(this) {
@Override
protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
return eventMode == null || eventMode.value() == config.isEventmode();
}
};
try {
linker.link();
} catch (AbstractLinker.LinkException e) {
logger.log(Level.SEVERE, e.getMessage(), e);
getProxy().shutdown();
return;
}
for(PacketHandler handler : new PacketHandler[] {
new EloPlayerHandler(), new EloSchemHandler(), new ExecuteCommandHandler(), new FightInfoHandler(),
new ImALobbyHandler(), new InventoryCallbackHandler(), new PrepareSchemHandler(), new PlayerSkinHandler(), new AnvilAnswerHandler()
})
handler.register();
new EventStarter();
new SessionManager();
tablistManager = new TablistManager();
new SettingsChangedListener();
schedule(() -> {
SteamwarUser.clear();
UserElo.clear();
@@ -269,8 +207,7 @@ public class VelocityCore implements ReloadablePlugin {
logger.log(Level.SEVERE, "Could not shutdown discord bot", e);
}
if(tablistManager != null)
tablistManager.disable();
linker.unlink();
errorLogger.unregister();
Statement.closeAll();

View File

@@ -19,11 +19,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.discord.DiscordBot;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.UserPerm;
@Linked
public class AlertCommand extends SWCommand {
public AlertCommand() {

View File

@@ -23,6 +23,7 @@ import com.velocitypowered.api.proxy.server.RegisteredServer;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.persistent.Subserver;
@@ -31,6 +32,7 @@ import de.steamwar.velocitycore.VelocityCore;
import java.util.Collection;
import java.util.List;
@Linked
public class ArenaCommand extends SWCommand {
public ArenaCommand() {

View File

@@ -19,16 +19,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.velocitycore.*;
import de.steamwar.velocitycore.inventory.SWInventory;
import de.steamwar.velocitycore.inventory.SWItem;
import de.steamwar.velocitycore.network.NetworkSender;
import de.steamwar.velocitycore.util.BauLock;
import de.steamwar.velocitycore.util.BauLockState;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.linkage.LinkedInstance;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -36,17 +33,25 @@ import de.steamwar.network.packets.server.BaumemberUpdatePacket;
import de.steamwar.persistent.Bauserver;
import de.steamwar.sql.BauweltMember;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.velocitycore.*;
import de.steamwar.velocitycore.inventory.SWInventory;
import de.steamwar.velocitycore.inventory.SWItem;
import de.steamwar.velocitycore.network.NetworkSender;
import de.steamwar.velocitycore.util.BauLock;
import de.steamwar.velocitycore.util.BauLockState;
import java.util.Collection;
import java.util.function.Consumer;
@Linked
@EventMode(false)
public class BauCommand extends SWCommand {
private final HelpCommand command;
@LinkedInstance
private HelpCommand command;
public BauCommand(HelpCommand command) {
public BauCommand() {
super("bau", "b", "build", "gs");
this.command = command;
}
@Register(noTabComplete = true)

View File

@@ -19,12 +19,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.persistent.Subserver;
import de.steamwar.sql.SWException;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
import de.steamwar.velocitycore.SubserverSystem;
@Linked
public class BugCommand extends SWCommand {
public BugCommand() {
super("bug");

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.ArenaMode;
import de.steamwar.velocitycore.ServerStarter;
import de.steamwar.velocitycore.ServerVersion;
@@ -37,6 +38,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@Linked
public class BuilderCloudCommand extends SWCommand {
public BuilderCloudCommand() {

View File

@@ -22,6 +22,8 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -35,6 +37,8 @@ import java.util.LinkedList;
import static de.steamwar.persistent.Storage.challenges;
@Linked
@EventMode(false)
public class ChallengeCommand extends SWCommand {
public ChallengeCommand() {

View File

@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -44,6 +45,7 @@ import java.util.concurrent.TimeUnit;
import java.util.function.BooleanSupplier;
import java.util.logging.Level;
@Linked
public class CheckCommand extends SWCommand {
private static final Map<SchematicType, SchematicType> fightTypes = new HashMap<>();
private static final Map<SchematicType, List<String>> checkQuestions = new HashMap<>();

View File

@@ -27,6 +27,7 @@ import de.steamwar.command.SWCommand;
import de.steamwar.command.SWCommandUtils;
import de.steamwar.command.TypeMapper;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -43,6 +44,7 @@ import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
@Linked
public class DevCommand extends SWCommand {
private final File devServerDir = new File("/configs/DevServer");

View File

@@ -23,6 +23,7 @@ import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.persistent.Subserver;
@@ -37,6 +38,7 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Linked
public class EventCommand extends SWCommand {
public EventCommand() {

View File

@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.Event;
import de.steamwar.sql.EventFight;
@@ -32,6 +33,7 @@ import java.util.Date;
import java.util.List;
import java.util.ListIterator;
@Linked
public class EventRescheduleCommand extends SWCommand {
public EventRescheduleCommand() {

View File

@@ -20,10 +20,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.EventFight;
import de.steamwar.sql.UserPerm;
@Linked
public class EventreloadCommand extends SWCommand {
public EventreloadCommand() {
super("eventreload", UserPerm.MODERATION);

View File

@@ -21,6 +21,8 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -36,6 +38,8 @@ import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
@Linked
@EventMode(false)
public class FightCommand extends SWCommand {
public FightCommand() {

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
@@ -31,6 +32,7 @@ import java.io.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@Linked
public class GDPRQuery extends SWCommand {
public GDPRQuery() {

View File

@@ -20,12 +20,14 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import net.kyori.adventure.text.event.ClickEvent;
import java.util.function.Function;
@Linked
public class HelpCommand extends SWCommand {
public HelpCommand() {

View File

@@ -20,6 +20,8 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -27,6 +29,8 @@ import de.steamwar.velocitycore.ArenaMode;
import de.steamwar.velocitycore.ServerStarter;
import net.kyori.adventure.text.event.ClickEvent;
@Linked
@EventMode(false)
public class HistoricCommand extends SWCommand {
public HistoricCommand() {
super("historic");

View File

@@ -20,10 +20,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.IgnoreSystem;
import de.steamwar.sql.SteamwarUser;
@Linked
public class IgnoreCommand extends SWCommand {
public IgnoreCommand() {

View File

@@ -20,12 +20,14 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.sql.UserPerm;
import net.kyori.adventure.text.event.ClickEvent;
@Linked
public class JoinmeCommand extends SWCommand {
public JoinmeCommand() {

View File

@@ -21,9 +21,11 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.UserPerm;
@Linked
public class KickCommand extends SWCommand {
public KickCommand() {

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.persistent.Subserver;
import de.steamwar.velocitycore.VelocityCore;
@@ -32,6 +33,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.stream.Collectors;
@Linked
public class ListCommand extends SWCommand {
public ListCommand() {

View File

@@ -19,10 +19,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.ChatListener;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.PlayerChatter;
@Linked
public class LocalCommand extends SWCommand {
public LocalCommand() {

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.inventory.SWInventory;
import de.steamwar.velocitycore.inventory.SWItem;
import de.steamwar.velocitycore.inventory.SWListInv;
@@ -35,6 +36,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.function.Consumer;
@Linked
public class ModCommand extends SWCommand {
public ModCommand() {

View File

@@ -20,17 +20,18 @@
package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.proxy.Velocity;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.listeners.ChatListener;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.ChatterGroup;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.sql.IgnoreSystem;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.listeners.ChatListener;
import static de.steamwar.persistent.Storage.lastChats;
@Linked
public class MsgCommand extends SWCommand {
public MsgCommand() {

View File

@@ -20,8 +20,10 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.PlayerChatter;
@Linked
public class PingCommand extends SWCommand {
public PingCommand() {

View File

@@ -20,11 +20,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.SteamwarUser;
import java.text.NumberFormat;
@Linked
public class PlaytimeCommand extends SWCommand {
public PlaytimeCommand() {

View File

@@ -19,12 +19,14 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.PollSystem;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.PollAnswer;
@Linked
public class PollCommand extends SWCommand {
public PollCommand() {

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.PollSystem;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator;
@@ -28,6 +29,7 @@ import de.steamwar.sql.UserPerm;
import java.util.Map;
@Linked
public class PollresultCommand extends SWCommand {
public PollresultCommand() {

View File

@@ -20,10 +20,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.PlayerChatter;
import static de.steamwar.persistent.Storage.lastChats;
@Linked
public class RCommand extends SWCommand {
public RCommand() {

View File

@@ -20,6 +20,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.sql.SteamwarUser;
@@ -28,6 +29,7 @@ import de.steamwar.velocitycore.ArenaMode;
import java.util.Optional;
@Linked
public class RankCommand extends SWCommand {
public RankCommand() {

View File

@@ -19,6 +19,8 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.ArenaMode;
import de.steamwar.messages.Message;
import de.steamwar.velocitycore.ServerStarter;
@@ -32,6 +34,8 @@ import de.steamwar.sql.*;
import java.util.ArrayList;
import java.util.List;
@Linked
@EventMode(false)
public class ReplayCommand extends SWCommand {
public ReplayCommand() {

View File

@@ -20,12 +20,14 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import net.kyori.adventure.text.event.ClickEvent;
import java.util.Arrays;
@Linked
public class RulesCommand extends SWCommand {
public RulesCommand() {
super("rules", "regeln");

View File

@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.server.ServerInfo;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.persistent.Subserver;
@@ -38,6 +39,7 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@Linked
public class SendCommand extends SWCommand {
// /send <server> [<users>]

View File

@@ -19,11 +19,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.ChatListener;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.UserPerm;
@Linked
public class ServerTeamchatCommand extends SWCommand {
public ServerTeamchatCommand() {

View File

@@ -20,10 +20,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.network.packets.server.LocaleInvalidationPacket;
import de.steamwar.velocitycore.network.NetworkSender;
@Linked
public class SetLocaleCommand extends SWCommand {
public SetLocaleCommand() {

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.Node;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
@@ -29,6 +30,7 @@ import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
@Linked
public class StatCommand extends SWCommand {
public StatCommand() {

View File

@@ -20,11 +20,15 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.persistent.Storage;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm;
@Linked
@EventMode(false)
public class StreamingCommand extends SWCommand {
public static boolean isNotStreaming(Chatter sender) {

View File

@@ -29,6 +29,7 @@ import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.messages.PlayerChatter;
@@ -52,6 +53,7 @@ import java.util.stream.Stream;
import static de.steamwar.persistent.Storage.teamInvitations;
@Linked
public class TeamCommand extends SWCommand {
public TeamCommand() {

View File

@@ -19,12 +19,14 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.ChatListener;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.ChatterGroup;
import de.steamwar.sql.SteamwarUser;
@Linked
public class TeamchatCommand extends SWCommand {
public TeamchatCommand() {

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.*;
import de.steamwar.velocitycore.util.BauLock;
import de.steamwar.command.PreviousArguments;
@@ -39,6 +40,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
@Linked
public class TpCommand extends SWCommand {
public TpCommand(){

View File

@@ -20,10 +20,12 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.IgnoreSystem;
import de.steamwar.sql.SteamwarUser;
@Linked
public class UnIgnoreCommand extends SWCommand {
public UnIgnoreCommand() {

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.discord.util.AuthManager;
import de.steamwar.command.SWCommand;
@@ -28,6 +29,7 @@ import net.dv8tion.jda.api.entities.User;
import java.util.Base64;
import java.util.logging.Level;
@Linked
public class VerifyCommand extends SWCommand {
public VerifyCommand() {

View File

@@ -20,9 +20,13 @@
package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.sql.SteamwarUser;
@Linked
@EventMode(false)
public class WebpasswordCommand extends SWCommand {
public WebpasswordCommand() {

View File

@@ -23,6 +23,7 @@ import com.velocitypowered.api.proxy.Player;
import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.persistent.Storage;
@@ -41,7 +42,7 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Linked
public class WhoisCommand extends SWCommand {
public WhoisCommand() {
super("whois");

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.LoginEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.sql.BannedUserIPs;
@@ -36,6 +37,7 @@ import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
@Linked
public class BanListener extends BasicListener {
@Subscribe

View File

@@ -29,6 +29,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection;
import com.velocitypowered.api.proxy.server.ServerInfo;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.ChatterGroup;
import de.steamwar.messages.Message;
@@ -50,6 +51,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@Linked
public class ChatListener extends BasicListener {
private static final Logger cmdLogger = Logger.getLogger("Command logger");

View File

@@ -24,6 +24,7 @@ import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.persistent.Bauserver;
import de.steamwar.persistent.Subserver;
@@ -34,6 +35,7 @@ import de.steamwar.velocitycore.commands.CheckCommand;
import java.util.ArrayList;
import java.util.List;
@Linked
public class CheckListener extends BasicListener {
@Subscribe

View File

@@ -27,6 +27,7 @@ import com.velocitypowered.api.event.player.KickedFromServerEvent;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.permission.Tristate;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.persistent.Subserver;
@@ -45,6 +46,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@Linked
public class ConnectionListener extends BasicListener {
private static final Set<UUID> newPlayers = new HashSet<>();

View File

@@ -22,11 +22,15 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.CookieReceiveEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.sql.EventFight;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.velocitycore.EventStarter;
import de.steamwar.velocitycore.VelocityCore;
@Linked
@EventMode(false)
public class CookieEvents extends BasicListener {
@Subscribe

View File

@@ -19,27 +19,25 @@
package de.steamwar.velocitycore.listeners;
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
import java.util.List;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.persistent.Subserver;
import de.steamwar.sql.Event;
import de.steamwar.sql.EventFight;
import de.steamwar.sql.Referee;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.TeamTeilnahme;
import de.steamwar.sql.*;
import de.steamwar.velocitycore.EventStarter;
import de.steamwar.velocitycore.VelocityCore;
import net.kyori.adventure.key.Key;
import java.net.InetSocketAddress;
import java.util.List;
@Linked
@EventMode(true)
public class EventModeListener extends BasicListener {
public static final Key EVENT_TO_SPECTATE_KEY = Key.key("sw", "event_to_spectate");

View File

@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.proxy.connection.MinecraftConnection;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
import de.steamwar.linkage.Linked;
import de.steamwar.persistent.Reflection;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.mods.Hostname;
@@ -38,6 +39,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.logging.Level;
@Linked
public class IPSanitizer extends BasicListener {
private static final Map<UUID, InetAddress> trueAddress = new HashMap<>(); // Will likely slightly leak over time

View File

@@ -31,6 +31,7 @@ import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
import com.velocitypowered.proxy.protocol.ProtocolUtils;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.network.packets.NetworkPacket;
import de.steamwar.sql.SteamwarUser;
@@ -50,6 +51,7 @@ import java.util.*;
import java.util.function.Consumer;
import java.util.logging.Level;
@Linked
public class PluginMessage extends BasicListener {
public static void send(Player player, String legacyChannel, String channel, byte[] data) {

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import de.steamwar.linkage.Linked;
import de.steamwar.sql.AuditLog;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.sql.Session;
@@ -32,6 +33,7 @@ import java.time.Instant;
import static de.steamwar.persistent.Storage.sessions;
@Linked
public class SessionManager extends BasicListener {
@Subscribe

View File

@@ -22,11 +22,13 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.network.NetworkSender;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.network.packets.server.LocaleInvalidationPacket;
@Linked
public class SettingsChangedListener extends BasicListener {
@Subscribe

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.ServerPostConnectEvent;
import com.velocitypowered.api.proxy.player.ResourcePackInfo;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import net.kyori.adventure.text.Component;
@@ -33,6 +34,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
// https://jd.papermc.io/velocity/3.4.0/com/velocitypowered/api/proxy/player/ResourcePackInfo.Builder.html#setHash(byte%5B%5D)
@Linked
public class TexturePackSystem extends BasicListener {
private static final File PACKS_DIR = new File("/var/www/packs");

View File

@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.server.ServerInfo;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.network.packets.server.ClientVersionPacket;
import de.steamwar.persistent.Subserver;
@@ -35,6 +36,7 @@ import de.steamwar.velocitycore.network.NetworkSender;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
@Linked
public class VersionAnnouncer extends BasicListener {
@Subscribe

View File

@@ -22,7 +22,9 @@ package de.steamwar.velocitycore.mods;
import com.google.gson.JsonObject;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
import de.steamwar.linkage.Linked;
@Linked
public class Badlion {
// https://github.com/BadlionClient/BadlionClientModAPI

View File

@@ -25,6 +25,7 @@ import com.velocitypowered.api.proxy.LoginPhaseConnection;
import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
import com.velocitypowered.proxy.protocol.ProtocolUtils;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.listeners.BasicListener;
import de.steamwar.velocitycore.listeners.PluginMessage;
@@ -37,6 +38,7 @@ import net.kyori.adventure.text.Component;
import java.util.*;
import java.util.logging.Level;
@Linked
public class FML2 extends BasicListener {
// FML2: https://wiki.vg/Minecraft_Forge_Handshake#FML2_protocol_.281.13_-_Current.29
// FML3: https://github.com/adde0109/Ambassador/tree/non-api/src/main/java/org/adde0109/ambassador/forge

View File

@@ -28,6 +28,7 @@ import com.velocitypowered.api.event.connection.PluginMessageEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.proxy.protocol.ProtocolUtils;
import de.steamwar.linkage.Linked;
import de.steamwar.persistent.Storage;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.listeners.BasicListener;
@@ -40,6 +41,7 @@ import io.netty.buffer.Unpooled;
import java.util.*;
import java.util.concurrent.TimeUnit;
@Linked
public class FabricModSender extends BasicListener {
private final Set<String> neededFabricMods = new HashSet<>();

View File

@@ -24,6 +24,7 @@ import com.velocitypowered.api.event.connection.ConnectionHandshakeEvent;
import com.velocitypowered.proxy.connection.client.InitialInboundConnection;
import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
import com.velocitypowered.proxy.protocol.packet.HandshakePacket;
import de.steamwar.linkage.Linked;
import de.steamwar.persistent.Reflection;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.listeners.BasicListener;
@@ -32,6 +33,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@Linked
public class Hostname extends BasicListener {
private static final Reflection.Field<LoginInboundConnection, InitialInboundConnection> delegate = new Reflection.Field<>(LoginInboundConnection.class, "delegate");

View File

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.mods;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.ServerPostConnectEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.persistent.Bauserver;
import de.steamwar.persistent.Builderserver;
import de.steamwar.velocitycore.VelocityCore;
@@ -32,6 +33,7 @@ import de.steamwar.velocitycore.listeners.PluginMessage;
import java.util.Arrays;
@Linked
public class ReplayMod extends BasicListener {
// https://gist.github.com/Johni0702/2547c463e51f65f312cb
// https://github.com/ReplayMod/replay-restrictions/blob/master/bungeecord/src/main/java/de/johni0702/replay/restrictions/BungeeCordPlugin.java

View File

@@ -22,8 +22,10 @@ package de.steamwar.velocitycore.mods;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.listeners.BasicListener;
@Linked
public class Schematica extends BasicListener {
// https://github.com/Lunatrius/SchematicaPlugin/blob/master/src/main/java/com/github/lunatrius/schematica/plugin/SchematicaPlugin.java

View File

@@ -19,10 +19,12 @@
package de.steamwar.velocitycore.network.handlers;
import de.steamwar.linkage.Linked;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.client.AnvilAnswerPacket;
import de.steamwar.velocitycore.inventory.SWAnvilInv;
@Linked
public class AnvilAnswerHandler extends PacketHandler {
@Handler

View File

@@ -20,6 +20,8 @@
package de.steamwar.velocitycore.network.handlers;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.EventMode;
import de.steamwar.linkage.Linked;
import de.steamwar.messages.Chatter;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.common.FightEndsPacket;
@@ -38,6 +40,7 @@ import java.util.concurrent.TimeUnit;
import java.util.function.IntFunction;
import java.util.stream.Collectors;
@Linked
public class EloPlayerHandler extends PacketHandler {
private static final int MEDIAN_ELO_GAIN = 40;

View File

@@ -19,6 +19,7 @@
package de.steamwar.velocitycore.network.handlers;
import de.steamwar.linkage.Linked;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.common.FightEndsPacket;
import de.steamwar.sql.SchemElo;
@@ -26,6 +27,7 @@ import de.steamwar.sql.SchematicNode;
import de.steamwar.sql.SchematicType;
import de.steamwar.velocitycore.ArenaMode;
@Linked
public class EloSchemHandler extends PacketHandler {
private static final int K = 20;

View File

@@ -19,11 +19,13 @@
package de.steamwar.velocitycore.network.handlers;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.client.ExecuteCommandPacket;
import de.steamwar.sql.SteamwarUser;
@Linked
public class ExecuteCommandHandler extends PacketHandler {
@Handler

View File

@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.network.handlers;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.network.NetworkSender;
import de.steamwar.velocitycore.network.ServerMetaInfo;
import de.steamwar.velocitycore.tablist.TablistManager;
@@ -30,6 +31,7 @@ import de.steamwar.network.packets.common.FightInfoPacket;
import java.util.HashSet;
import java.util.Set;
@Linked
public class FightInfoHandler extends PacketHandler {
private static final Set<RegisteredServer> lobbys = new HashSet<>();

View File

@@ -19,10 +19,12 @@
package de.steamwar.velocitycore.network.handlers;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.network.ServerMetaInfo;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.client.ImALobbyPacket;
@Linked
public class ImALobbyHandler extends PacketHandler {
@Handler

View File

@@ -20,6 +20,7 @@
package de.steamwar.velocitycore.network.handlers;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.inventory.InvCallback;
import de.steamwar.velocitycore.inventory.SWInventory;
import de.steamwar.velocitycore.network.NetworkSender;
@@ -33,6 +34,7 @@ import de.steamwar.sql.SteamwarUser;
import java.util.HashMap;
import java.util.Map;
@Linked
public class InventoryCallbackHandler extends PacketHandler {
public static final Map<Integer, SWInventory> inventoryHashMap = new HashMap<>();

View File

@@ -27,6 +27,7 @@ import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.util.GameProfile;
import de.steamwar.linkage.Linked;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.common.PlayerSkinRequestPacket;
import de.steamwar.network.packets.common.PlayerSkinResponsePacket;
@@ -46,6 +47,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
@Linked
public class PlayerSkinHandler extends PacketHandler {
private final int maxCacheSize = 1000;

View File

@@ -20,6 +20,7 @@
package de.steamwar.velocitycore.network.handlers;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.linkage.Linked;
import de.steamwar.velocitycore.ArenaMode;
import de.steamwar.velocitycore.ServerStarter;
import de.steamwar.velocitycore.VelocityCore;
@@ -28,6 +29,7 @@ import de.steamwar.network.packets.client.PrepareSchemPacket;
import de.steamwar.sql.SchematicType;
import de.steamwar.sql.SteamwarUser;
@Linked
public class PrepareSchemHandler extends PacketHandler {
@Handler

View File

@@ -26,6 +26,8 @@ import com.velocitypowered.api.event.player.ServerPostConnectEvent;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import de.steamwar.linkage.Linked;
import de.steamwar.linkage.api.Disable;
import de.steamwar.network.packets.common.FightInfoPacket;
import de.steamwar.persistent.Storage;
import de.steamwar.persistent.Subserver;
@@ -38,7 +40,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
public class TablistManager extends BasicListener {
@Linked
public class TablistManager extends BasicListener implements Disable {
private static final Map<RegisteredServer, FightInfoPacket> fightInfos = new HashMap<>();

View File

@@ -187,7 +187,8 @@ include(
"CommonCore",
"CommonCore:Data",
"CommonCore:SQL",
"CommonCore:Network"
"CommonCore:Network",
"CommonCore:Linkage"
)
include(