Skip to content

Commit

Permalink
Update project group
Browse files Browse the repository at this point in the history
  • Loading branch information
esotericenderman committed Sep 16, 2024
1 parent b983edf commit c70c64f
Show file tree
Hide file tree
Showing 33 changed files with 130 additions and 121 deletions.
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
package net.slqmy.firework_wars_plugin;
package org.esoteric_organisation.firework_wars_plugin;

import dev.jorel.commandapi.CommandAPI;
import dev.jorel.commandapi.CommandAPIBukkitConfig;
import net.slqmy.firework_wars_plugin.arena.manager.ArenaManager;
import net.slqmy.firework_wars_plugin.commands.ArenaCommand;
import net.slqmy.firework_wars_plugin.commands.SetLanguageCommand;
import net.slqmy.firework_wars_plugin.data.player.PlayerDataManager;
import net.slqmy.firework_wars_plugin.game.GameManager;
import net.slqmy.firework_wars_plugin.items.manager.CustomItemManager;
import net.slqmy.firework_wars_plugin.language.LanguageManager;
import net.slqmy.firework_wars_plugin.util.PersistentDataManager;

import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.esoteric_organisation.firework_wars_plugin.arena.manager.ArenaManager;
import org.esoteric_organisation.firework_wars_plugin.commands.ArenaCommand;
import org.esoteric_organisation.firework_wars_plugin.commands.SetLanguageCommand;
import org.esoteric_organisation.firework_wars_plugin.data.player.PlayerDataManager;
import org.esoteric_organisation.firework_wars_plugin.game.GameManager;
import org.esoteric_organisation.firework_wars_plugin.items.manager.CustomItemManager;
import org.esoteric_organisation.firework_wars_plugin.language.LanguageManager;
import org.esoteric_organisation.firework_wars_plugin.util.PersistentDataManager;

import java.util.logging.Logger;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.slqmy.firework_wars_plugin;
package org.esoteric_organisation.firework_wars_plugin;

import io.papermc.paper.plugin.bootstrap.BootstrapContext;
import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
import io.papermc.paper.registry.event.RegistryEvents;
import net.slqmy.firework_wars_plugin.items.manager.CustomItemManager;
import net.slqmy.firework_wars_plugin.util.ReflectUtil;

import org.bukkit.plugin.java.JavaPlugin;
import org.esoteric_organisation.firework_wars_plugin.items.manager.CustomItemManager;
import org.esoteric_organisation.firework_wars_plugin.util.ReflectUtil;
import org.jetbrains.annotations.NotNull;

@SuppressWarnings({"UnstableApiUsage", "unused"})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.arena.data_type;
package org.esoteric_organisation.firework_wars_plugin.arena.data_type;

import com.google.gson.annotations.Expose;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.arena.data_type;
package org.esoteric_organisation.firework_wars_plugin.arena.data_type;

import org.bukkit.Bukkit;
import org.bukkit.Location;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.arena.deserializer;
package org.esoteric_organisation.firework_wars_plugin.arena.deserializer;

import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.arena.manager;
package org.esoteric_organisation.firework_wars_plugin.arena.manager;

import java.io.File;
import java.io.FileReader;
Expand All @@ -8,10 +8,10 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.arena.deserializer.ColorDeserializer;
import net.slqmy.firework_wars_plugin.arena.structure.ArenaInformation;
import org.bukkit.Color;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.arena.deserializer.ColorDeserializer;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.ArenaInformation;

public class ArenaManager {
private static final String ARENAS_RESOURCE_PATH = "arenas.json";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.slqmy.firework_wars_plugin.arena.structure;
package org.esoteric_organisation.firework_wars_plugin.arena.structure;

import com.google.gson.annotations.Expose;
import org.esoteric_organisation.firework_wars_plugin.arena.data_type.BlockLocation;
import org.esoteric_organisation.firework_wars_plugin.arena.data_type.PlayerLocation;

import net.slqmy.firework_wars_plugin.arena.data_type.BlockLocation;
import net.slqmy.firework_wars_plugin.arena.data_type.PlayerLocation;
import com.google.gson.annotations.Expose;

public class Arena {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.slqmy.firework_wars_plugin.arena.structure;
package org.esoteric_organisation.firework_wars_plugin.arena.structure;

import com.google.gson.annotations.Expose;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.Arena;

import net.slqmy.firework_wars_plugin.arena.structure.Arena;
import com.google.gson.annotations.Expose;

public class ArenaInformation {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.slqmy.firework_wars_plugin.arena.structure;
package org.esoteric_organisation.firework_wars_plugin.arena.structure;

import com.google.gson.annotations.Expose;

import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.slqmy.firework_wars_plugin.arena.data_type.PlayerLocation;

import org.bukkit.Color;
import org.esoteric_organisation.firework_wars_plugin.arena.data_type.PlayerLocation;

public class ConfiguredTeam {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package net.slqmy.firework_wars_plugin.commands;
package org.esoteric_organisation.firework_wars_plugin.commands;

import java.util.ArrayList;
import java.util.List;

import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.arena.manager.ArenaManager;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.Arena;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.ArenaInformation;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame;
import org.esoteric_organisation.firework_wars_plugin.game.GameManager;

import dev.jorel.commandapi.CommandAPICommand;
import dev.jorel.commandapi.arguments.ArgumentSuggestions;
import dev.jorel.commandapi.arguments.IntegerArgument;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.arena.structure.Arena;
import net.slqmy.firework_wars_plugin.arena.structure.ArenaInformation;
import net.slqmy.firework_wars_plugin.arena.manager.ArenaManager;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame;
import net.slqmy.firework_wars_plugin.game.GameManager;

public class ArenaCommand extends CommandAPICommand {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.commands;
package org.esoteric_organisation.firework_wars_plugin.commands;

import dev.jorel.commandapi.CommandAPICommand;
import dev.jorel.commandapi.arguments.Argument;
Expand All @@ -11,10 +11,11 @@

import java.util.Set;

import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.language.LanguageManager;
import org.esoteric_organisation.firework_wars_plugin.language.Message;

import net.kyori.adventure.text.Component;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.language.LanguageManager;
import net.slqmy.firework_wars_plugin.language.Message;

public class SetLanguageCommand extends CommandAPICommand {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package net.slqmy.firework_wars_plugin.data.player;
package org.esoteric_organisation.firework_wars_plugin.data.player;

import com.google.gson.Gson;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;

import org.bukkit.entity.Player;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;

import java.io.File;
import java.io.FileReader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.slqmy.firework_wars_plugin.data.player;
package org.esoteric_organisation.firework_wars_plugin.data.player;

import java.util.UUID;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package net.slqmy.firework_wars_plugin.event.listeners;
package org.esoteric_organisation.firework_wars_plugin.event.listeners;

import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame;

public class GameEventListener implements Listener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package net.slqmy.firework_wars_plugin.game;
package org.esoteric_organisation.firework_wars_plugin.game;

import java.util.ArrayList;
import java.util.List;

import net.slqmy.firework_wars_plugin.event.listeners.GameEventListener;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.Arena;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.ConfiguredTeam;
import org.esoteric_organisation.firework_wars_plugin.event.listeners.GameEventListener;
import org.esoteric_organisation.firework_wars_plugin.language.Message;

import net.kyori.adventure.text.minimessage.MiniMessage;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.arena.structure.Arena;
import net.slqmy.firework_wars_plugin.arena.structure.ConfiguredTeam;
import net.slqmy.firework_wars_plugin.language.Message;

public class FireworkWarsGame {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.slqmy.firework_wars_plugin.game;
package org.esoteric_organisation.firework_wars_plugin.game;

import java.util.ArrayList;
import java.util.List;

import org.bukkit.entity.Player;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.ConfiguredTeam;

import net.kyori.adventure.text.Component;
import net.slqmy.firework_wars_plugin.arena.structure.ConfiguredTeam;

public class FireworkWarsTeam {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package net.slqmy.firework_wars_plugin.game;
package org.esoteric_organisation.firework_wars_plugin.game;

import org.bukkit.scheduler.BukkitRunnable;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame.GameState;
import net.slqmy.firework_wars_plugin.language.Message;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame.GameState;
import org.esoteric_organisation.firework_wars_plugin.language.Message;

public class GameCountdown extends BukkitRunnable {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package net.slqmy.firework_wars_plugin.game;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.arena.structure.Arena;
package org.esoteric_organisation.firework_wars_plugin.game;

import java.util.HashMap;
import java.util.Map;

import org.bukkit.entity.Player;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.arena.structure.Arena;

public class GameManager {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
package net.slqmy.firework_wars_plugin.items.guns;
package org.esoteric_organisation.firework_wars_plugin.items.guns;

import io.papermc.paper.event.entity.EntityLoadCrossbowEvent;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame;
import net.slqmy.firework_wars_plugin.items.manager.AbstractItem;
import net.slqmy.firework_wars_plugin.items.nms.CustomCrossbow;
import net.slqmy.firework_wars_plugin.util.ItemBuilder;
import net.slqmy.firework_wars_plugin.util.Keys;

import org.bukkit.Color;
import org.bukkit.FireworkEffect;
import org.bukkit.Material;
Expand All @@ -16,6 +11,12 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.CrossbowMeta;
import org.bukkit.inventory.meta.FireworkMeta;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame;
import org.esoteric_organisation.firework_wars_plugin.items.manager.AbstractItem;
import org.esoteric_organisation.firework_wars_plugin.items.nms.CustomCrossbow;
import org.esoteric_organisation.firework_wars_plugin.util.ItemBuilder;
import org.esoteric_organisation.firework_wars_plugin.util.Keys;

public abstract class BaseGunItem extends AbstractItem {
protected final String ammoId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package net.slqmy.firework_wars_plugin.items.guns.rifle;
package org.esoteric_organisation.firework_wars_plugin.items.guns.rifle;

import io.papermc.paper.event.entity.EntityLoadCrossbowEvent;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame;
import net.slqmy.firework_wars_plugin.game.FireworkWarsTeam;
import net.slqmy.firework_wars_plugin.items.guns.BaseGunItem;
import net.slqmy.firework_wars_plugin.language.Message;

import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.CrossbowMeta;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsTeam;
import org.esoteric_organisation.firework_wars_plugin.items.guns.BaseGunItem;
import org.esoteric_organisation.firework_wars_plugin.language.Message;

import java.util.List;
import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package net.slqmy.firework_wars_plugin.items.guns.rifle;
package org.esoteric_organisation.firework_wars_plugin.items.guns.rifle;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.items.manager.AbstractItem;
import net.slqmy.firework_wars_plugin.language.Message;
import net.slqmy.firework_wars_plugin.util.ItemBuilder;
import net.slqmy.firework_wars_plugin.util.Keys;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.items.manager.AbstractItem;
import org.esoteric_organisation.firework_wars_plugin.language.Message;
import org.esoteric_organisation.firework_wars_plugin.util.ItemBuilder;
import org.esoteric_organisation.firework_wars_plugin.util.Keys;

public class RifleAmmo extends AbstractItem {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package net.slqmy.firework_wars_plugin.items.guns.shotgun;
package org.esoteric_organisation.firework_wars_plugin.items.guns.shotgun;

import io.papermc.paper.event.entity.EntityLoadCrossbowEvent;
import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.game.FireworkWarsGame;
import net.slqmy.firework_wars_plugin.game.FireworkWarsTeam;
import net.slqmy.firework_wars_plugin.items.guns.BaseGunItem;
import net.slqmy.firework_wars_plugin.language.Message;

import org.bukkit.entity.Firework;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.CrossbowMeta;
import org.bukkit.util.Vector;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsGame;
import org.esoteric_organisation.firework_wars_plugin.game.FireworkWarsTeam;
import org.esoteric_organisation.firework_wars_plugin.items.guns.BaseGunItem;
import org.esoteric_organisation.firework_wars_plugin.language.Message;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package net.slqmy.firework_wars_plugin.items.guns.shotgun;
package org.esoteric_organisation.firework_wars_plugin.items.guns.shotgun;

import net.slqmy.firework_wars_plugin.FireworkWarsPlugin;
import net.slqmy.firework_wars_plugin.items.manager.AbstractItem;
import net.slqmy.firework_wars_plugin.language.Message;
import net.slqmy.firework_wars_plugin.util.ItemBuilder;
import net.slqmy.firework_wars_plugin.util.Keys;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.esoteric_organisation.firework_wars_plugin.FireworkWarsPlugin;
import org.esoteric_organisation.firework_wars_plugin.items.manager.AbstractItem;
import org.esoteric_organisation.firework_wars_plugin.language.Message;
import org.esoteric_organisation.firework_wars_plugin.util.ItemBuilder;
import org.esoteric_organisation.firework_wars_plugin.util.Keys;

public class ShotgunAmmo extends AbstractItem {
public ShotgunAmmo(FireworkWarsPlugin plugin) {
Expand Down
Loading

0 comments on commit c70c64f

Please sign in to comment.