Upstream
/
CrazyAuctions
mirror of https://github.com/Crazy-Crew/CrazyAuctions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use plugin variable

This commit is contained in:
Ryder Belserion 2023-07-20 22:22:51 -04:00
parent 453c77f192
commit a46b2acfa3
No known key found for this signature in database
GPG Key ID: 6F86975AD74B46E5
17 changed files with 74 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionAddEvent.java
View File

@ -1,13 +1,13 @@
package com.badbones69.crazyauctions.api.events;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.api.manager.interfaces.AuctionItem;
import com.badbones69.crazyauctions.api.manager.objects.AuctionHouse;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
/**
@ -15,6 +15,8 @@ import java.util.UUID;
*/
public class AuctionAddEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -31,7 +33,7 @@ public class AuctionAddEvent extends Event {
*/
public AuctionAddEvent(UUID uuid, AuctionHouse auctionHouse, AuctionItem auctionItem) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.auctionHouse = auctionHouse;
this.auctionItem = auctionItem;
}

7
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBidEvent.java
View File

@ -1,10 +1,11 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
@ -13,6 +14,8 @@ import java.util.UUID;
*/
public class AuctionBidEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -32,7 +35,7 @@ public class AuctionBidEvent extends Event {
public AuctionBidEvent(UUID uuid, ItemStack item, long bidPrice) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.item = item;

8
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java
View File

@ -1,12 +1,12 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
/**
@ -14,6 +14,8 @@ import java.util.UUID;
*/
public class AuctionBuyEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -33,7 +35,7 @@ public class AuctionBuyEvent extends Event {
public AuctionBuyEvent(UUID uuid, ItemStack item, long price) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.item = item;

9
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelEvent.java
View File

@ -1,11 +1,12 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
@ -14,6 +15,8 @@ import java.util.UUID;
*/
public class AuctionCancelEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -30,9 +33,9 @@ public class AuctionCancelEvent extends Event {
public AuctionCancelEvent(UUID uuid, ItemStack item) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.offlinePlayer = Bukkit.getOfflinePlayer(uuid);
this.offlinePlayer = this.plugin.getServer().getOfflinePlayer(uuid);
this.item = item;
}

7
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java
View File

@ -1,10 +1,11 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
@ -13,6 +14,8 @@ import java.util.UUID;
*/
public class AuctionExpireEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -28,7 +31,7 @@ public class AuctionExpireEvent extends Event {
public AuctionExpireEvent(UUID uuid, ItemStack item) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.item = item;
}

8
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java
View File

@ -1,12 +1,12 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
/**
@ -14,6 +14,8 @@ import java.util.UUID;
*/
public class AuctionListEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -33,7 +35,7 @@ public class AuctionListEvent extends Event {
public AuctionListEvent(UUID uuid, ItemStack item, long bidPrice) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.item = item;

8
paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinEvent.java
View File

@ -1,12 +1,12 @@
package com.badbones69.crazyauctions.api.events;
import org.bukkit.Bukkit;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
/**
@ -14,6 +14,8 @@ import java.util.UUID;
*/
public class AuctionWinEvent extends Event {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private static final HandlerList handlerList = new HandlerList();
private final UUID uuid;
@ -33,7 +35,7 @@ public class AuctionWinEvent extends Event {
public AuctionWinEvent(UUID uuid, ItemStack item, long price) {
this.uuid = uuid;
this.player = Bukkit.getPlayer(uuid);
this.player = this.plugin.getServer().getPlayer(uuid);
this.item = item;

10
paper/src/main/java/com/badbones69/crazyauctions/api/interfaces/Universal.java
View File

@ -1,10 +0,0 @@
package com.badbones69.crazyauctions.api.interfaces;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.plugin.java.JavaPlugin;
public interface Universal {
CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
}

10
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/AuctionButtons.java
View File

@ -1,12 +1,12 @@
package com.badbones69.crazyauctions.api.manager.objects;
import com.badbones69.crazyauctions.utils.ItemUtils;
import org.bukkit.configuration.file.FileConfiguration;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.plugin.java.JavaPlugin;
/*
*/
public class AuctionButtons {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
/*
private final ItemBuilder sellingItemsButton;
private final ItemBuilder sellingInfoButton;

4
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/AuctionCategory.java
View File

@ -1,7 +1,9 @@
package com.badbones69.crazyauctions.api.manager.objects;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.api.frame.items.ItemBuilder;
import org.bukkit.Material;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.List;
/**
@ -9,6 +11,8 @@ import java.util.List;
*/
public class AuctionCategory {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private String name;
private int slot;
//private ItemBuilder displayItem;

7
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/AuctionHouse.java
View File

@ -1,24 +1,25 @@
package com.badbones69.crazyauctions.api.manager.objects;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.api.manager.enums.AuctionType;
import com.badbones69.crazyauctions.api.manager.interfaces.AuctionItem;
import com.badbones69.crazyauctions.api.manager.objects.auctiontype.BiddingAuction;
import com.badbones69.crazyauctions.api.manager.objects.auctiontype.SellingAuction;
import com.badbones69.crazyauctions.api.events.AuctionAddEvent;
import com.badbones69.crazyauctions.utils.ItemUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* Description: Creates the main auction house menu
*/
public class AuctionHouse {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private String name;
private FileConfiguration auctionFile;
private InventorySettings inventorySettings;

4
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/InventorySettings.java
View File

@ -1,12 +1,16 @@
package com.badbones69.crazyauctions.api.manager.objects;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
/**
* Description: Creates the auction house inventory settings
*/
public class InventorySettings {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
private final String title;
private final AuctionButtons auctionButtons = null;

4
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/auctiontype/BiddingAuction.java
View File

@ -1,8 +1,10 @@
package com.badbones69.crazyauctions.api.manager.objects.auctiontype;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.api.manager.enums.AuctionType;
import com.badbones69.crazyauctions.api.manager.interfaces.AuctionItem;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.UUID;
/**
@ -10,6 +12,8 @@ import java.util.UUID;
*/
public class BiddingAuction implements AuctionItem {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
AuctionType auctionType = AuctionType.BID;
UUID seller;
UUID highestBidder;

5
paper/src/main/java/com/badbones69/crazyauctions/api/manager/objects/auctiontype/SellingAuction.java
View File

@ -1,9 +1,10 @@
package com.badbones69.crazyauctions.api.manager.objects.auctiontype;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.api.manager.enums.AuctionType;
import com.badbones69.crazyauctions.api.manager.interfaces.AuctionItem;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.UUID;
/**
@ -11,6 +12,8 @@ import java.util.UUID;
*/
public class SellingAuction implements AuctionItem {
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
AuctionType auctionType = AuctionType.SELL;
UUID seller;
long price;

4
paper/src/main/java/com/badbones69/crazyauctions/support/PlaceholderSupport.java
View File

@ -1,10 +1,14 @@
package com.badbones69.crazyauctions.support;
import com.badbones69.crazyauctions.ApiManager;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.config.types.PluginConfig;
import org.bukkit.plugin.java.JavaPlugin;
public class PlaceholderSupport {
private static final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
public static String setPlaceholders(String placeholder) {
placeholder = placeholder.replaceAll("\\{prefix}", ApiManager.getPluginConfig().getProperty(PluginConfig.COMMAND_PREFIX));

79
paper/src/main/java/com/badbones69/crazyauctions/utils/ItemUtils.java
View File

@ -1,81 +1,10 @@
package com.badbones69.crazyauctions.utils;
import com.badbones69.crazyauctions.CrazyAuctions;
import org.bukkit.plugin.java.JavaPlugin;
public class ItemUtils {
/**
* Converts a string to an ItemBuilder with a placeholder for errors.
*
* @param itemString The String you wish to convert.
* @return The String as an ItemBuilder.
public static ItemBuilder convertString(String itemString) {
ItemBuilder itemBuilder = new ItemBuilder();
private final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
try {
for (String optionString : itemString.split(", ")) {
String option = optionString.split(":")[0];
String value = optionString.replace(option + ":", "").replace(option, "");
switch (option.toLowerCase()) {
case "item":
itemBuilder.setValue(value);
break;
case "name":
//itemBuilder.setDisplayName(value);
break;
case "amount":
try {
itemBuilder.setAmount(Integer.parseInt(value));
} catch (NumberFormatException e) {
itemBuilder.setAmount(1);
}
break;
case "lore":
//itemBuilder.setLore(Arrays.asList(value.split(",")));
break;
case "player":
itemBuilder.setTexture(value);
break;
case "unbreakable-item":
//if (value.isEmpty() || value.equalsIgnoreCase("true")) itemBuilder.setUnbreakable(true);
break;
default:
// Enchantment enchantment = getEnchantment(option);
//
// if (enchantment != null && enchantment.getName() != null) {
// try {
// itemBuilder.addEnchantments(enchantment, Integer.parseInt(value));
// } catch (NumberFormatException e) {
// itemBuilder.addEnchantments(enchantment, 1);
// }
//
// break;
// }
//
// for (ItemFlag itemFlag : ItemFlag.values()) {
// if (itemFlag.name().equalsIgnoreCase(option)) {
// itemBuilder.addItemFlags(Arrays.asList(itemFlag.name()));
// break;
// }
// }
//
// try {
// for (PatternType pattern : PatternType.values()) {
// if (option.equalsIgnoreCase(pattern.name()) || value.equalsIgnoreCase(pattern.getIdentifier())) {
// DyeColor color = getDyeColor(value);
// if (color != null) itemBuilder.addPattern(new Pattern(color, pattern));
// break;
// }
// }
// } catch (Exception ignored) {
// }
break;
}
}
} catch (Exception e) {
//ItemBuilder.setMaterial(Material.RED_TERRACOTTA).setDisplayName("&c&lERROR").setLore(Arrays.asList("&cThere is an error", "&cFor : &c"));
e.printStackTrace();
}
return itemBuilder;
}*/
}

7
paper/src/main/java/com/badbones69/crazyauctions/utils/misc/ColorUtils.java
View File

@ -1,10 +1,13 @@
package com.badbones69.crazyauctions.utils.misc;
import com.badbones69.crazyauctions.ApiManager;
import com.badbones69.crazyauctions.api.interfaces.Universal;
import com.badbones69.crazyauctions.CrazyAuctions;
import com.badbones69.crazyauctions.config.types.PluginConfig;
import org.bukkit.plugin.java.JavaPlugin;
public class ColorUtils implements Universal {
public class ColorUtils {
private static final CrazyAuctions plugin = JavaPlugin.getPlugin(CrazyAuctions.class);
public static String getPrefix() {
return ApiManager.getPluginConfig().getProperty(PluginConfig.COMMAND_PREFIX);