Skip to content

Commit

Permalink
Restructure project for future move to gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kas-tle
Kas-tle authored Sep 12, 2022
1 parent 198e223 commit 53a277d
Show file tree
Hide file tree
Showing 74 changed files with 225 additions and 254 deletions.
6 changes: 3 additions & 3 deletions bukkit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>net.paradisu.paradisuplugin</groupId>
<groupId>net.paradisu</groupId>
<artifactId>parent</artifactId>
<version>${minecraft.plugin.version}</version>
<version>3.4.0</version>
</parent>

<artifactId>bukkit</artifactId>
Expand Down Expand Up @@ -99,7 +99,7 @@
<relocations>
<relocation>
<pattern>de.themoep</pattern>
<shadedPattern>net.paradisu.paradisuplugin.libs</shadedPattern>
<shadedPattern>net.paradisu.libs</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand Down
40 changes: 20 additions & 20 deletions ...u/paradisuplugin/bukkit/ParadisuMain.java → ...ava/net/paradisu/bukkit/ParadisuMain.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit;
package net.paradisu.bukkit;


import java.io.File;
Expand All @@ -21,25 +21,25 @@
import cloud.commandframework.execution.CommandExecutionCoordinator;
import cloud.commandframework.meta.SimpleCommandMeta;
import cloud.commandframework.paper.PaperCommandManager;
import net.paradisu.paradisuplugin.bukkit.util.DatabaseConnection;
import net.paradisu.paradisuplugin.bukkit.util.TimeZone;
import net.paradisu.paradisuplugin.bukkit.commands.AdminCommands;
import net.paradisu.paradisuplugin.bukkit.commands.EssentialCommands;
import net.paradisu.paradisuplugin.bukkit.commands.ParadisuCommands;
import net.paradisu.paradisuplugin.bukkit.events.GuiListeners;
import net.paradisu.paradisuplugin.bukkit.events.ParadisuEvents;
import net.paradisu.paradisuplugin.bukkit.items.ItemCommands;
import net.paradisu.paradisuplugin.bukkit.items.SpinningCoins;
import net.paradisu.paradisuplugin.bukkit.items.ItemEvents;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelCommands;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelInvManager;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager;
import net.paradisu.paradisuplugin.bukkit.items.models.modelscroller.ModelScrollerEvents;
import net.paradisu.paradisuplugin.bukkit.playerdata.PlayerDataEvents;
import net.paradisu.paradisuplugin.bukkit.shops.ShopCommands;
import net.paradisu.paradisuplugin.bukkit.shops.ShopGuis;
import net.paradisu.paradisuplugin.bukkit.warps.WarpCommands;
import net.paradisu.paradisuplugin.bukkit.warps.WarpsDataHandler;
import net.paradisu.bukkit.util.DatabaseConnection;
import net.paradisu.bukkit.util.TimeZone;
import net.paradisu.bukkit.commands.AdminCommands;
import net.paradisu.bukkit.commands.EssentialCommands;
import net.paradisu.bukkit.commands.ParadisuCommands;
import net.paradisu.bukkit.events.GuiListeners;
import net.paradisu.bukkit.events.ParadisuEvents;
import net.paradisu.bukkit.items.ItemCommands;
import net.paradisu.bukkit.items.SpinningCoins;
import net.paradisu.bukkit.items.ItemEvents;
import net.paradisu.bukkit.items.models.ModelCommands;
import net.paradisu.bukkit.items.models.ModelInvManager;
import net.paradisu.bukkit.items.models.ModelItemManager;
import net.paradisu.bukkit.items.models.modelscroller.ModelScrollerEvents;
import net.paradisu.bukkit.playerdata.PlayerDataEvents;
import net.paradisu.bukkit.shops.ShopCommands;
import net.paradisu.bukkit.shops.ShopGuis;
import net.paradisu.bukkit.warps.WarpCommands;
import net.paradisu.bukkit.warps.WarpsDataHandler;

public class ParadisuMain extends JavaPlugin {

Expand Down
4 changes: 2 additions & 2 deletions ...plugin/bukkit/commands/AdminCommands.java → ...radisu/bukkit/commands/AdminCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.commands;
package net.paradisu.bukkit.commands;

import java.util.List;

Expand All @@ -15,7 +15,7 @@
import cloud.commandframework.annotations.CommandPermission;
import cloud.commandframework.annotations.ProxiedBy;
import net.luckperms.api.LuckPermsProvider;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;

public class AdminCommands {

Expand Down
4 changes: 2 additions & 2 deletions ...in/bukkit/commands/EssentialCommands.java → ...su/bukkit/commands/EssentialCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.commands;
package net.paradisu.bukkit.commands;

import org.bukkit.GameMode;
import org.bukkit.command.CommandSender;
Expand All @@ -8,7 +8,7 @@
import cloud.commandframework.annotations.CommandDescription;
import cloud.commandframework.annotations.CommandMethod;
import cloud.commandframework.annotations.CommandPermission;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;

public class EssentialCommands /* MEANT FOR ANY REWRITTEN VANILLA/QOL COMMANDS */ {

Expand Down
18 changes: 9 additions & 9 deletions ...gin/bukkit/commands/ParadisuCommands.java → ...isu/bukkit/commands/ParadisuCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.commands;
package net.paradisu.bukkit.commands;

import java.sql.Connection;
import java.sql.PreparedStatement;
Expand All @@ -17,14 +17,14 @@
import cloud.commandframework.annotations.CommandDescription;
import cloud.commandframework.annotations.CommandMethod;
import cloud.commandframework.annotations.CommandPermission;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.events.PlaytimeEvents;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.NoItem;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuEffects;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuHead;
import net.paradisu.paradisuplugin.bukkit.items.invs.TrashCan;
import net.paradisu.paradisuplugin.bukkit.util.TimeZone;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.events.PlaytimeEvents;
import net.paradisu.bukkit.items.common.menu.BlankItem;
import net.paradisu.bukkit.items.common.menu.NoItem;
import net.paradisu.bukkit.items.common.menu.ParadisuEffects;
import net.paradisu.bukkit.items.common.menu.ParadisuHead;
import net.paradisu.bukkit.items.invs.TrashCan;
import net.paradisu.bukkit.util.TimeZone;

public class ParadisuCommands {

Expand Down
10 changes: 5 additions & 5 deletions ...isuplugin/bukkit/events/GuiListeners.java → .../paradisu/bukkit/events/GuiListeners.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.events;
package net.paradisu.bukkit.events;

import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
Expand All @@ -10,10 +10,10 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager;
import net.paradisu.paradisuplugin.bukkit.shops.PlayerInventories;
import net.paradisu.paradisuplugin.bukkit.shops.ShopGuis;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.models.ModelItemManager;
import net.paradisu.bukkit.shops.PlayerInventories;
import net.paradisu.bukkit.shops.ShopGuis;

public class GuiListeners implements Listener {

Expand Down
10 changes: 5 additions & 5 deletions ...uplugin/bukkit/events/ParadisuEvents.java → ...aradisu/bukkit/events/ParadisuEvents.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.events;
package net.paradisu.bukkit.events;

import static org.bukkit.Bukkit.getServer;

Expand Down Expand Up @@ -34,10 +34,10 @@
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.items.GenItemManager;
import net.paradisu.paradisuplugin.bukkit.items.invs.TrashCan;
import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.GenItemManager;
import net.paradisu.bukkit.items.invs.TrashCan;
import net.paradisu.bukkit.util.InventoryGUI;

public class ParadisuEvents implements Listener {

Expand Down
4 changes: 2 additions & 2 deletions ...uplugin/bukkit/events/PlaytimeEvents.java → ...aradisu/bukkit/events/PlaytimeEvents.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.events;
package net.paradisu.bukkit.events;

import java.sql.Connection;
import java.sql.PreparedStatement;
Expand All @@ -16,7 +16,7 @@
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;

public class PlaytimeEvents implements Listener {

Expand Down
4 changes: 2 additions & 2 deletions ...suplugin/bukkit/items/GenItemManager.java → ...paradisu/bukkit/items/GenItemManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.paradisu.paradisuplugin.bukkit.items;
package net.paradisu.bukkit.items;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;
import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
Expand Down
10 changes: 5 additions & 5 deletions ...disuplugin/bukkit/items/ItemCommands.java → ...t/paradisu/bukkit/items/ItemCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package net.paradisu.paradisuplugin.bukkit.items;
package net.paradisu.bukkit.items;

import cloud.commandframework.annotations.Argument;
import cloud.commandframework.annotations.CommandMethod;
import cloud.commandframework.annotations.CommandPermission;
import cloud.commandframework.annotations.ProxiedBy;
import cloud.commandframework.annotations.specifier.Greedy;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.items.common.ingame.ParadisuCoin;
import net.paradisu.paradisuplugin.bukkit.items.common.ingame.StarCoin;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuHead;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.common.ingame.ParadisuCoin;
import net.paradisu.bukkit.items.common.ingame.StarCoin;
import net.paradisu.bukkit.items.common.menu.ParadisuHead;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
Expand Down
6 changes: 3 additions & 3 deletions ...radisuplugin/bukkit/items/ItemEvents.java → ...net/paradisu/bukkit/items/ItemEvents.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items;
package net.paradisu.bukkit.items;

import java.util.Random;
import java.util.UUID;
Expand All @@ -13,8 +13,8 @@
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.util.EventCooldowns;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.util.EventCooldowns;

public class ItemEvents implements Listener {

Expand Down
2 changes: 1 addition & 1 deletion ...isuplugin/bukkit/items/SpinningCoins.java → .../paradisu/bukkit/items/SpinningCoins.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items;
package net.paradisu.bukkit.items;

import org.bukkit.Bukkit;
import org.bukkit.Location;
Expand Down
2 changes: 1 addition & 1 deletion ...kit/items/common/ingame/ParadisuCoin.java → ...kit/items/common/ingame/ParadisuCoin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.common.ingame;
package net.paradisu.bukkit.items.common.ingame;

import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
Expand Down
2 changes: 1 addition & 1 deletion .../bukkit/items/common/ingame/StarCoin.java → .../bukkit/items/common/ingame/StarCoin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.common.ingame;
package net.paradisu.bukkit.items.common.ingame;

import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
Expand Down
2 changes: 1 addition & 1 deletion ...n/bukkit/items/common/menu/BlankItem.java → ...u/bukkit/items/common/menu/BlankItem.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.common.menu;
package net.paradisu.bukkit.items.common.menu;

import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
Expand Down
2 changes: 1 addition & 1 deletion ...ugin/bukkit/items/common/menu/NoItem.java → ...disu/bukkit/items/common/menu/NoItem.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.common.menu;
package net.paradisu.bukkit.items.common.menu;

import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
Expand Down
2 changes: 1 addition & 1 deletion ...it/items/common/menu/ParadisuEffects.java → ...it/items/common/menu/ParadisuEffects.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.common.menu;
package net.paradisu.bukkit.items.common.menu;

import java.util.ArrayList;

Expand Down
4 changes: 2 additions & 2 deletions ...ukkit/items/common/menu/ParadisuHead.java → ...ukkit/items/common/menu/ParadisuHead.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package net.paradisu.paradisuplugin.bukkit.items.common.menu;
package net.paradisu.bukkit.items.common.menu;

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;

import net.paradisu.paradisuplugin.bukkit.playerdata.PlayerDataGetter;
import net.paradisu.bukkit.playerdata.PlayerDataGetter;

public class ParadisuHead extends ItemStack {
public ParadisuHead (Player player){
Expand Down
10 changes: 5 additions & 5 deletions ...lugin/bukkit/items/invs/ModelGiveInv.java → ...adisu/bukkit/items/invs/ModelGiveInv.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.invs;
package net.paradisu.bukkit.items.invs;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -12,10 +12,10 @@
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.ItemMeta;

import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelInvManager;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager;
import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI;
import net.paradisu.bukkit.items.common.menu.BlankItem;
import net.paradisu.bukkit.items.models.ModelInvManager;
import net.paradisu.bukkit.items.models.ModelItemManager;
import net.paradisu.bukkit.util.InventoryGUI;

public class ModelGiveInv implements InventoryGUI{

Expand Down
4 changes: 2 additions & 2 deletions ...gin/bukkit/items/invs/ServerSwitcher.java → ...isu/bukkit/items/invs/ServerSwitcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package net.paradisu.paradisuplugin.bukkit.items.invs;
package net.paradisu.bukkit.items.invs;

// import org.bukkit.entity.Player;
// import org.bukkit.inventory.Inventory;
// import org.bukkit.plugin.Plugin;

// import net.luckperms.api.cacheddata.CachedDataManager.Container;
// import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
// import net.paradisu.bukkit.ParadisuMain;
// import de.themoep.inventorygui.InventoryGui;

public class ServerSwitcher {
Expand Down
10 changes: 5 additions & 5 deletions ...isuplugin/bukkit/items/invs/TrashCan.java → .../paradisu/bukkit/items/invs/TrashCan.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package net.paradisu.paradisuplugin.bukkit.items.invs;
package net.paradisu.bukkit.items.invs;

import org.bukkit.Bukkit;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem;
import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager;
import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.common.menu.BlankItem;
import net.paradisu.bukkit.items.models.ModelItemManager;
import net.paradisu.bukkit.util.InventoryGUI;

public class TrashCan implements InventoryGUI {

Expand Down
6 changes: 3 additions & 3 deletions ...in/bukkit/items/models/ModelCommands.java → ...su/bukkit/items/models/ModelCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.models;
package net.paradisu.bukkit.items.models;

import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
Expand All @@ -7,8 +7,8 @@
import cloud.commandframework.annotations.Argument;
import cloud.commandframework.annotations.CommandMethod;
import cloud.commandframework.annotations.CommandPermission;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.paradisuplugin.bukkit.items.invs.ModelGiveInv;
import net.paradisu.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.invs.ModelGiveInv;

public class ModelCommands {

Expand Down
4 changes: 2 additions & 2 deletions .../bukkit/items/models/ModelInvManager.java → .../bukkit/items/models/ModelInvManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.paradisu.paradisuplugin.bukkit.items.models;
package net.paradisu.bukkit.items.models;

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

import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;

public abstract class ModelInvManager {

Expand Down
4 changes: 2 additions & 2 deletions ...bukkit/items/models/ModelItemManager.java → ...bukkit/items/models/ModelItemManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.paradisu.paradisuplugin.bukkit.items.models;
package net.paradisu.bukkit.items.models;

import java.sql.Connection;
import java.sql.PreparedStatement;
Expand All @@ -11,7 +11,7 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.ParadisuMain;

public class ModelItemManager {

Expand Down
6 changes: 3 additions & 3 deletions .../modelscroller/ModelScrollerCommands.java → .../modelscroller/ModelScrollerCommands.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.paradisu.paradisuplugin.bukkit.items.models.modelscroller;
package net.paradisu.bukkit.items.models.modelscroller;

import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager;
import net.paradisu.paradisuplugin.bukkit.ParadisuMain;
import net.paradisu.bukkit.items.models.ModelItemManager;
import net.paradisu.bukkit.ParadisuMain;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.World;
import org.bukkit.command.Command;
Expand Down
Loading

0 comments on commit 53a277d

Please sign in to comment.