mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-02 12:56:40 +00:00
Cyclic Dependency Patch
- Fixed cyclic dependencies - Added a TFShoppe class for effective plugin initialization - Registered discord commands, did not before - Added SLF4J loggers for module logging.
This commit is contained in:
@ -0,0 +1,27 @@
|
||||
package me.totalfreedom.totalfreedommod.api;
|
||||
|
||||
public class Aggregator
|
||||
{
|
||||
private Context<TFD4JCommons> discord;
|
||||
private Context<ShoppeCommons> shoppe;
|
||||
|
||||
public Context<TFD4JCommons> getDiscordContext()
|
||||
{
|
||||
return discord;
|
||||
}
|
||||
|
||||
public void setDiscordContext(Context<TFD4JCommons> discord)
|
||||
{
|
||||
this.discord = discord;
|
||||
}
|
||||
|
||||
public Context<ShoppeCommons> getShoppeContext()
|
||||
{
|
||||
return shoppe;
|
||||
}
|
||||
|
||||
public void setShoppeContext(Context<ShoppeCommons> shoppe)
|
||||
{
|
||||
this.shoppe = shoppe;
|
||||
}
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package me.totalfreedom.totalfreedommod.api;
|
||||
|
||||
public class Context<T>
|
||||
{
|
||||
private final T value;
|
||||
|
||||
public Context(T value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public T getValue()
|
||||
{
|
||||
return value;
|
||||
}
|
||||
}
|
@ -0,0 +1,116 @@
|
||||
package me.totalfreedom.totalfreedommod.api;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
|
||||
public enum ShopItem
|
||||
{
|
||||
GRAPPLING_HOOK("Grappling Hook", Material.FISHING_ROD, 10, ConfigEntry.SHOP_PRICES_GRAPPLING_HOOK, ChatColor.GREEN, "grapplingHook", "/grapplinghook"),
|
||||
LIGHTNING_ROD("Lightning Rod", Material.BLAZE_ROD, 12, ConfigEntry.SHOP_PRICES_LIGHTNING_ROD, ChatColor.LIGHT_PURPLE, "lightningRod", "/lightningrod"),
|
||||
FIRE_BALL("Fire Ball", Material.FIRE_CHARGE, 14, ConfigEntry.SHOP_PRICES_FIRE_BALL, ChatColor.RED, "fireBall", "/fireball"),
|
||||
RIDEABLE_PEARL("Rideable Ender Pearl", Material.ENDER_PEARL, 16, ConfigEntry.SHOP_PRICES_RIDEABLE_PEARL, ChatColor.DARK_PURPLE, "rideablePearl", "/rideablepearl"),
|
||||
STACKING_POTATO("Stacking Potato", Material.POTATO, 19, ConfigEntry.SHOP_PRICES_STACKING_POTATO, ChatColor.YELLOW, "stackingPotato", "/stackingpotato"),
|
||||
CLOWN_FISH("Clown Fish", Material.TROPICAL_FISH, 21, ConfigEntry.SHOP_PRICES_CLOWN_FISH, ChatColor.GOLD, "clownFish", "/clownfish"),
|
||||
LOGIN_MESSAGES("Login Messages", Material.NAME_TAG, 23, ConfigEntry.SHOP_PRICES_LOGIN_MESSAGES, ChatColor.DARK_GREEN, "loginMessages", "/loginmessage"),
|
||||
RAINBOW_TRAIL("Rainbow Trail", Material.RED_WOOL, 25, ConfigEntry.SHOP_PRICES_RAINBOW_TRAIL, ChatColor.DARK_RED, "rainbowTrail", "/trail");
|
||||
|
||||
/*
|
||||
Shop GUI Layout:
|
||||
|
||||
Dimensions: 9x4 = 36
|
||||
Key:
|
||||
g = Grappling Hook,
|
||||
l = Lightning Rod
|
||||
f = Fire Ball
|
||||
r = Rideable Ender Pearl
|
||||
s = Stacking Potato
|
||||
c = Clown Fish
|
||||
x = Login Messages
|
||||
t = Rainbow Trail
|
||||
$ = Coins
|
||||
|
||||
---------
|
||||
-g-l-f-r-
|
||||
-s-c-x-t-
|
||||
--------$
|
||||
*/
|
||||
|
||||
|
||||
private final String name;
|
||||
|
||||
private final Material icon;
|
||||
|
||||
private final int slot;
|
||||
private final ConfigEntry cost;
|
||||
|
||||
private final ChatColor color;
|
||||
|
||||
private final String dataName;
|
||||
|
||||
private final String command;
|
||||
|
||||
ShopItem(String name, Material icon, int slot, ConfigEntry cost, ChatColor color, String dataName, String command)
|
||||
{
|
||||
this.name = name;
|
||||
this.icon = icon;
|
||||
this.slot = slot;
|
||||
this.cost = cost;
|
||||
this.color = color;
|
||||
this.dataName = dataName;
|
||||
this.command = command;
|
||||
}
|
||||
|
||||
public static ShopItem findItem(String string)
|
||||
{
|
||||
try
|
||||
{
|
||||
return ShopItem.valueOf(string.toUpperCase());
|
||||
}
|
||||
catch (Exception ignored)
|
||||
{
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getColoredName()
|
||||
{
|
||||
return color + name;
|
||||
}
|
||||
|
||||
public int getCost()
|
||||
{
|
||||
return cost.getInteger();
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public Material getIcon()
|
||||
{
|
||||
return icon;
|
||||
}
|
||||
|
||||
public int getSlot()
|
||||
{
|
||||
return slot;
|
||||
}
|
||||
|
||||
public ChatColor getColor()
|
||||
{
|
||||
return color;
|
||||
}
|
||||
|
||||
public String getDataName()
|
||||
{
|
||||
return dataName;
|
||||
}
|
||||
|
||||
public String getCommand()
|
||||
{
|
||||
return command;
|
||||
}
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package me.totalfreedom.totalfreedommod.api;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
|
||||
public interface ShoppeCommons
|
||||
{
|
||||
|
||||
int getCoinsPerReactionWin();
|
||||
|
||||
void startReactionTimer();
|
||||
|
||||
void forceStartReaction();
|
||||
|
||||
void startReaction();
|
||||
|
||||
void endReaction(String winner);
|
||||
|
||||
String getShopPrefix();
|
||||
|
||||
String getShopTitle();
|
||||
|
||||
Inventory generateShopGUI(PlayerData playerData);
|
||||
|
||||
Inventory generateLoginMessageGUI(Player player);
|
||||
|
||||
boolean isRealItem(PlayerData data, ShopItem shopItem, PlayerInventory inventory, ItemStack realItem);
|
||||
|
||||
boolean isRealItem(PlayerData data, ShopItem shopItem, ItemStack givenItem, ItemStack realItem);
|
||||
|
||||
ItemStack getLightningRod();
|
||||
|
||||
ItemStack getGrapplingHook();
|
||||
|
||||
ItemStack getFireBall();
|
||||
|
||||
ItemStack getRideablePearl();
|
||||
|
||||
ItemStack getStackingPotato();
|
||||
|
||||
ItemStack getClownFish();
|
||||
|
||||
boolean canAfford(int price, int coins);
|
||||
|
||||
int amountNeeded(int price, int coins);
|
||||
|
||||
ItemStack shopGUIItem(ShopItem item, PlayerData data);
|
||||
|
||||
ShopItem getShopItem(int slot);
|
||||
|
||||
String getReactionString();
|
||||
}
|
@ -0,0 +1,33 @@
|
||||
package me.totalfreedom.totalfreedommod.api;
|
||||
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface TFD4JCommons
|
||||
{
|
||||
void messageAdminChatChannel(String message);
|
||||
|
||||
void clearQueue();
|
||||
|
||||
void messageChatChannel(String message, boolean system);
|
||||
|
||||
boolean syncRoles(Admin admin, String id);
|
||||
|
||||
String getCode(PlayerData playerData);
|
||||
|
||||
String generateCode(int size);
|
||||
|
||||
Map<String, PlayerData> getLinkCodes();
|
||||
|
||||
String formatBotTag();
|
||||
|
||||
boolean sendReportOffline(Player reporter, OfflinePlayer reported, String reason);
|
||||
|
||||
boolean sendReport(Player reporter, Player reported, String reason);
|
||||
|
||||
boolean isEnabled();
|
||||
}
|
Reference in New Issue
Block a user