Skip to content

Commit

Permalink
Added GUI configuration in guis.yml
Browse files Browse the repository at this point in the history
End of support for legacy versions
  • Loading branch information
timsixth committed Sep 7, 2023
1 parent 1ce81b4 commit 4fe107d
Show file tree
Hide file tree
Showing 59 changed files with 1,836 additions and 791 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.idea/
/T-Troll.iml
/src/META-INF/
/target/
51 changes: 48 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@

<groupId>me.timsixth</groupId>
<artifactId>T-Troll</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -26,11 +30,52 @@
<version>1.18.26</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.timsixth.T-GuiApi</groupId>
<artifactId>core</artifactId>
<version>v2.0.0</version>
</dependency>
</dependencies>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<relocations>
<relocation>
<pattern>pl.timsixth.guilibrary.core</pattern>
<shadedPattern>me.timsixth.troll.guilibrary.core</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>>com.github.timsixth.T-GuiApi:core</artifact>
<excludeDefaults>false</excludeDefaults>
<includes>
<include>me.timsixth.troll.guilibrary.core</include>
</includes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
84 changes: 74 additions & 10 deletions src/main/java/me/timsixth/troll/TrollPlugin.java
Original file line number Diff line number Diff line change
@@ -1,51 +1,115 @@
package me.timsixth.troll;

import lombok.Getter;
import me.timsixth.troll.bstats.Metrics;
import me.timsixth.troll.command.AdminTrollCommand;
import me.timsixth.troll.command.TrollCommand;
import me.timsixth.troll.config.ConfigFile;
import me.timsixth.troll.config.Messages;
import me.timsixth.troll.gui.ExecuteTrollAction;
import me.timsixth.troll.manager.MenuManager;
import me.timsixth.troll.listener.*;
import me.timsixth.troll.manager.InventoryManager;
import me.timsixth.troll.manager.TrollManager;
import me.timsixth.troll.manager.TrollProcessManager;
import me.timsixth.troll.model.troll.*;
import me.timsixth.troll.tabcompleter.AdminTrollCommandTabCompleter;
import me.timsixth.troll.version.VersionChecker;
import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import pl.timsixth.guilibrary.core.GUIApi;
import pl.timsixth.guilibrary.core.manager.YAMLMenuManager;
import pl.timsixth.guilibrary.core.model.action.custom.NoneClickAction;

@Getter
public class TrollPlugin extends JavaPlugin {

private TrollManager trollManager;
private TrollProcessManager trollProcessManager;
private Messages messages;
private ConfigFile configFile;

@Override
public void onEnable() {
getConfig().options().copyDefaults(true);
saveConfig();

GUIApi guiApi = new GUIApi(this);

messages = new Messages(this);
configFile = new ConfigFile(this, messages);
InventoryManager inventoryManager = new InventoryManager(configFile);
trollManager = new TrollManager(this);

getCommand("troll").setExecutor(new TrollCommand(inventoryManager, trollManager, messages, configFile));
trollProcessManager = new TrollProcessManager(this);
trollManager = new TrollManager();

YAMLMenuManager menuManager = new MenuManager(guiApi.getActionRegistration(), configFile);

guiApi.getActionRegistration().register(new NoneClickAction(), new ExecuteTrollAction());
guiApi.setMenuManager(menuManager);

getCommand("troll").setExecutor(new TrollCommand(menuManager, trollProcessManager, messages, configFile));
getCommand("atroll").setExecutor(new AdminTrollCommand(configFile, messages));
getCommand("atroll").setTabCompleter(new AdminTrollCommandTabCompleter());

guiApi.registerMenuListener();
registerListeners();
registerTrolls();

new VersionChecker(this).checkVersion();

new Metrics(this, 19466);

menuManager.load();
}

private void registerListeners() {
PluginManager pluginManager = Bukkit.getPluginManager();
pluginManager.registerEvents(new PlayerChatListener(trollManager, configFile, this), this);
pluginManager.registerEvents(new PlayerMoveListener(trollManager), this);
pluginManager.registerEvents(new InventoryClickListener(trollManager, this, messages, configFile), this);
pluginManager.registerEvents(new PlayerQuitListener(trollManager), this);
pluginManager.registerEvents(new PlayerVehicleListener(trollManager, messages), this);
pluginManager.registerEvents(new PlayerDropItemListener(trollManager), this);
pluginManager.registerEvents(new PlayerChatListener(trollProcessManager, configFile, this), this);
pluginManager.registerEvents(new PlayerMoveListener(trollProcessManager), this);
pluginManager.registerEvents(new PlayerQuitListener(trollProcessManager), this);
pluginManager.registerEvents(new PlayerVehicleListener(trollProcessManager, messages), this);
pluginManager.registerEvents(new PlayerDropItemListener(trollProcessManager), this);
}

private void registerTrolls() {
trollManager.addTrolls(
new AdminRewardTroll(messages, configFile),
new AnvilTroll(messages),
new ArrowSpamTroll(messages),
new BlowUpTroll(configFile, messages),
new ChatSpamTroll(messages),
new CreeperSoundTroll(messages),
new DropGlassTroll(messages, configFile, this),
new DropHandItemTroll(messages),
new DrunkTroll(messages, configFile),
new EndermanTeleportTroll(messages),
new FakeBanTroll(messages),
new FakeCrashTroll(messages),
new FakeExpTroll(messages, this),
new FakeInventoryClearTroll(messages, trollProcessManager),
new FakeJoinTroll(messages),
new FakeOpTroll(configFile, messages),
new FreezeTroll(messages),
new HackerCodeTroll(messages, configFile),
new LavaTroll(messages),
new MinecartTroll(messages, this, configFile),
new OpenInventoryTroll(messages),
new PoisonTroll(messages),
new PumpkinTroll(messages),
new RandomPotionEffectTroll(messages),
new RandomTeleportTroll(messages),
new RocketWithPlayerTroll(messages),
new RotateTroll(messages),
new ScareTroll(messages),
new SlimeFriendTroll(messages, configFile),
new SpawnTeleportTroll(messages),
new SpeedTroll(messages),
new StrikeLightningTroll(messages),
new SwitchFakeAdminTroll(messages, configFile),
new TeleportUnderPlayerTroll(messages, configFile),
new WaterTroll(messages),
new WebTroll(messages),
new ZombieTroll(messages)
);
}
}
23 changes: 14 additions & 9 deletions src/main/java/me/timsixth/troll/command/TrollCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@
import lombok.RequiredArgsConstructor;
import me.timsixth.troll.config.ConfigFile;
import me.timsixth.troll.config.Messages;
import me.timsixth.troll.manager.InventoryManager;
import me.timsixth.troll.manager.TrollManager;
import me.timsixth.troll.model.Troll;
import me.timsixth.troll.manager.TrollProcessManager;
import me.timsixth.troll.model.TrollProcess;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import pl.timsixth.guilibrary.core.manager.YAMLMenuManager;
import pl.timsixth.guilibrary.core.model.Menu;

import java.util.Optional;

@RequiredArgsConstructor
public class TrollCommand implements CommandExecutor {

private final InventoryManager inventoryManager;
private final TrollManager trollManager;
private final YAMLMenuManager menuManager;
private final TrollProcessManager trollProcessManager;

private final Messages messages;
private final ConfigFile configFile;
Expand All @@ -38,11 +39,15 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String
} else if (args.length == 1) {
Player other = Bukkit.getPlayerExact(args[0]);

Optional<Troll> trollBySenderUuid = trollManager.getTrollBySenderUuid(player.getUniqueId());
trollBySenderUuid.ifPresent(trollManager::removeTroll);
Optional<TrollProcess> trollBySenderUuid = trollProcessManager.getTrollBySenderUuid(player.getUniqueId());
trollBySenderUuid.ifPresent(trollProcessManager::removeTroll);
if (other != null) {
trollManager.createNewTroll(new Troll(player.getUniqueId(), other.getUniqueId()));
player.openInventory(inventoryManager.showTrollingInventory());
trollProcessManager.createNewTroll(new TrollProcess(player.getUniqueId(), other.getUniqueId()));
Optional<Menu> menuOptional = menuManager.getMenuByName("trollsGui");

if (!menuOptional.isPresent()) return true;

player.openInventory(menuManager.createMenu(menuOptional.get()));
} else {
player.sendMessage(messages.getOfflinePlayer());
}
Expand Down
30 changes: 25 additions & 5 deletions src/main/java/me/timsixth/troll/config/ConfigFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import lombok.Getter;
import me.timsixth.troll.TrollPlugin;
import me.timsixth.troll.util.ChatUtil;
import org.bukkit.configuration.file.YamlConfiguration;

import java.io.File;

@Getter
public class ConfigFile {
Expand All @@ -13,7 +16,6 @@ public class ConfigFile {
@Getter(value = AccessLevel.NONE)
private final Messages messages;
private String permission;
private String guiName;
private String fakeAdminFormat;
private String fakeOpFormat;
private float powerOfExplosion;
Expand All @@ -27,16 +29,22 @@ public class ConfigFile {
private boolean victimMessage;
private String itemRewardName;

public ConfigFile(TrollPlugin trollPlugin,Messages messages) {
private final File guisFile;
private final YamlConfiguration ymlGuis;

public ConfigFile(TrollPlugin trollPlugin, Messages messages) {
this.trollPlugin = trollPlugin;
this.messages = messages;

guisFile = createFile("guis.yml");
ymlGuis = YamlConfiguration.loadConfiguration(guisFile);

loadSettings();
}

private void loadSettings(){
private void loadSettings() {
permission = trollPlugin.getConfig().getString("permission");
powerOfExplosion = trollPlugin.getConfig().getInt("power_explosion");
guiName = ChatUtil.chatColor(trollPlugin.getConfig().getString("guiname"));
fakeAdminFormat = ChatUtil.chatColor(trollPlugin.getConfig().getString("fakeadmin_format"));
fakeOpFormat = ChatUtil.chatColor(trollPlugin.getConfig().getString("fakeop_format"));
guiPrefix = ChatUtil.chatColor(trollPlugin.getConfig().getString("gui_prefix"));
Expand All @@ -49,9 +57,21 @@ private void loadSettings(){
victimMessage = trollPlugin.getConfig().getBoolean("victimMessage");
itemRewardName = ChatUtil.chatColor(trollPlugin.getConfig().getString("itemRewardName"));
}
public void reloadConfig(){

public void reloadConfig() {
trollPlugin.reloadConfig();
loadSettings();
messages.loadMessages();
}

private File createFile(String name) {
if (!trollPlugin.getDataFolder().exists()) {
trollPlugin.getDataFolder().mkdir();
}
File file = new File(trollPlugin.getDataFolder(), name);
if (!file.exists()) {
trollPlugin.saveResource(name, true);
}
return file;
}
}
71 changes: 71 additions & 0 deletions src/main/java/me/timsixth/troll/gui/ExecuteTrollAction.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package me.timsixth.troll.gui;

import me.timsixth.troll.TrollPlugin;
import me.timsixth.troll.config.Messages;
import me.timsixth.troll.manager.TrollManager;
import me.timsixth.troll.manager.TrollProcessManager;
import me.timsixth.troll.model.Troll;
import me.timsixth.troll.model.TrollProcess;
import me.timsixth.troll.model.TrolledUserProperties;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import pl.timsixth.guilibrary.core.model.MenuItem;
import pl.timsixth.guilibrary.core.model.action.AbstractAction;
import pl.timsixth.guilibrary.core.model.action.click.ClickAction;

import java.util.Optional;

public class ExecuteTrollAction extends AbstractAction implements ClickAction {

private final Messages messages;
private final TrollProcessManager trollProcessManager;
private final TrollManager trollManager;

public ExecuteTrollAction() {
super("EXECUTE_TROLL");
TrollPlugin trollPlugin = TrollPlugin.getPlugin(TrollPlugin.class);
messages = trollPlugin.getMessages();
trollProcessManager = trollPlugin.getTrollProcessManager();
trollManager = trollPlugin.getTrollManager();
}

@Override
public void handleClickEvent(InventoryClickEvent event, MenuItem menuItem) {
String trollName = getArgs().get(0);
Player player = (Player) event.getWhoClicked();

Optional<TrollProcess> trollBySenderUuid = trollProcessManager.getTrollBySenderUuid(player.getUniqueId());
Optional<Troll> trollOptional = trollManager.getTrollByName(trollName);

if (!trollOptional.isPresent()) {
event.setCancelled(true);
return;
}

if (!trollBySenderUuid.isPresent()) {
event.setCancelled(true);
return;
}

TrolledUserProperties trolledUser = trollBySenderUuid.get().getTrolledUser();
Player other = Bukkit.getPlayer(trollBySenderUuid.get().getVictimUuid());
Troll troll = trollOptional.get();

if (isPlayerOnline(other, player, event)) {
troll.executeTroll(other, player, trolledUser);
event.setCancelled(true);
}
}

private boolean isPlayerOnline(Player other, Player sender, InventoryClickEvent event) {
if (other == null) {
event.setCancelled(true);
sender.closeInventory();

sender.sendMessage(messages.getOfflinePlayer());
return false;
}
return true;
}
}
Loading

0 comments on commit 4fe107d

Please sign in to comment.