Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-28 16:05:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reworked proxy package

Browse Source
This commit is contained in:
Auxilor 2020-12-31 17:37:45 +00:00
parent 3292cf8447
commit 4b115b8334
86 changed files with 155 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/BlockBreak.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import net.minecraft.server.v1_15_R1.BlockPosition;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/ChatComponent.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/ChatComponent.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
import org.jetbrains.annotations.NotNull;
public final class ChatComponent implements ChatComponentProxy {

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/Cooldown.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import net.minecraft.server.v1_15_R1.EntityHuman;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/FastGetEnchants.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/FastGetEnchants.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import net.minecraft.server.v1_15_R1.NBTBase;
import net.minecraft.server.v1_15_R1.NBTTagCompound;
import net.minecraft.server.v1_15_R1.NBTTagList;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/OpenInventory.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/OpenInventory.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/RepairCost.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/RepairCost.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/TridentStack.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import net.minecraft.server.v1_15_R1.EntityThrownTrident;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTrident;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/VillagerTrade.java → eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/VillagerTrade.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_15_R1;
package com.willfp.ecoenchants.proxy.v1_15_R1;
import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftMerchantRecipe;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/BlockBreak.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import net.minecraft.server.v1_16_R1.BlockPosition;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/ChatComponent.java
View File

@ -1,10 +1,10 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import net.minecraft.server.v1_16_R1.ChatBaseComponent;
import net.minecraft.server.v1_16_R1.ChatHoverable;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/Cooldown.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/FastGetEnchants.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/FastGetEnchants.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import net.minecraft.server.v1_16_R1.NBTBase;
import net.minecraft.server.v1_16_R1.NBTTagCompound;
import net.minecraft.server.v1_16_R1.NBTTagList;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/OpenInventory.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/OpenInventory.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/RepairCost.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/RepairCost.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/TridentStack.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import net.minecraft.server.v1_16_R1.EntityThrownTrident;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTrident;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/VillagerTrade.java → eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/VillagerTrade.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R1;
package com.willfp.ecoenchants.proxy.v1_16_R1;
import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftMerchantRecipe;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/BlockBreak.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import net.minecraft.server.v1_16_R2.BlockPosition;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/ChatComponent.java
View File

@ -1,10 +1,10 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import net.minecraft.server.v1_16_R2.ChatBaseComponent;
import net.minecraft.server.v1_16_R2.ChatHoverable;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/Cooldown.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/FastGetEnchants.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/FastGetEnchants.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import net.minecraft.server.v1_16_R2.NBTBase;
import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R2.NBTTagList;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/OpenInventory.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/OpenInventory.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/RepairCost.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/RepairCost.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/TridentStack.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import net.minecraft.server.v1_16_R2.EntityThrownTrident;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/VillagerTrade.java → eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/VillagerTrade.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R2;
package com.willfp.ecoenchants.proxy.v1_16_R2;
import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftMerchantRecipe;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/BlockBreak.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import net.minecraft.server.v1_16_R3.BlockPosition;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/ChatComponent.java
View File

@ -1,10 +1,10 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import net.minecraft.server.v1_16_R3.ChatBaseComponent;
import net.minecraft.server.v1_16_R3.ChatHoverable;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/Cooldown.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/FastGetEnchants.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import net.minecraft.server.v1_16_R3.NBTBase;
import net.minecraft.server.v1_16_R3.NBTTagCompound;
import net.minecraft.server.v1_16_R3.NBTTagList;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/OpenInventory.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/OpenInventory.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/RepairCost.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/TridentStack.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import net.minecraft.server.v1_16_R3.EntityThrownTrident;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/VillagerTrade.java → eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/VillagerTrade.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.v1_16_R3;
package com.willfp.ecoenchants.proxy.v1_16_R3;
import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.display.EnchantDisplay;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe;

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.command.AbstractCommand;
import com.willfp.eco.util.drops.telekinesis.TelekinesisUtils;
@ -52,7 +52,7 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin {
* Internal constructor called by bukkit on plugin load.
*/
public EcoEnchantsPlugin() {
super("EcoEnchants", 79573, 7666);
super("EcoEnchants", 79573, 7666, "com.willfp.ecoenchants.proxy");
}
/**

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.command.commands;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.ListenerPriority;
import com.willfp.eco.core.proxy.ProxyConstants;
import com.willfp.eco.util.proxy.ProxyConstants;
import com.willfp.eco.util.command.AbstractCommand;
import com.willfp.eco.util.drops.internal.DropManager;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java
View File

@ -4,7 +4,7 @@ import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display.packets;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.eco.util.protocollib.AbstractPacketAdapter;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.DurabilityUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
import com.willfp.eco.util.integrations.antigrief.AntigriefManager;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.VectorUtils;
import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.VectorUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.util.BlockUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.drops.DropQueue;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.config.Configs;
import com.willfp.eco.util.drops.DropQueue;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.LightningUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.util.BlockUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.LightningUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.spell;
import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
import com.willfp.eco.util.integrations.antigrief.AntigriefManager;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java
View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.itemtypes;
import com.google.common.util.concurrent.AtomicDouble;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.optional.Prerequisite;

6
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java
View File

@ -1,8 +1,8 @@
package com.willfp.ecoenchants.enchantments.support.merging.anvil;
import com.willfp.eco.core.proxy.ProxyConstants;
import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
import com.willfp.eco.util.proxy.ProxyConstants;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.config.Configs;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java
View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.util;
import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import com.willfp.eco.util.DurabilityUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.util;
import com.google.common.collect.Sets;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.events.armorequip.ArmorEquipEvent;
import com.willfp.eco.util.internal.PluginDependent;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/BlockBreakProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java
View File

@ -1,7 +1,7 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/ChatComponentProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/ChatComponentProxy.java
View File

@ -1,7 +1,7 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.jetbrains.annotations.NotNull;
public interface ChatComponentProxy extends AbstractProxy {

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/CooldownProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java
View File

@ -1,7 +1,7 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/FastGetEnchantsProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/FastGetEnchantsProxy.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/OpenInventoryProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/OpenInventoryProxy.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/RepairCostProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/TridentStackProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java
View File

@ -1,7 +1,7 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.entity.Trident;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

4
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/VillagerTradeProxy.java → eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/VillagerTradeProxy.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.core.proxy.proxies;
package com.willfp.ecoenchants.proxy.proxies;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.AbstractProxy;
import org.bukkit.inventory.MerchantRecipe;
public interface VillagerTradeProxy extends AbstractProxy {

2
eco-extensions/mmo/build.gradle
View File

@ -1,5 +1,5 @@
group 'com.willfp'
version '3.0.0'
version '3.0.1'
description = 'MMO Extension'
repositories {

2
eco-extensions/precision/build.gradle
View File

@ -1,5 +1,5 @@
group 'com.willfp'
version '3.0.0'
version '3.0.1'
description = 'Precision Extension'
jar {

2
eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java
View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.precision;
import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;

2
eco-extensions/summoning/build.gradle
View File

@ -1,5 +1,5 @@
group 'com.willfp'
version '3.0.0'
version '3.0.1'
description = 'Summoning Extension'
jar {

2
eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.summoning;
import com.willfp.eco.core.proxy.proxies.CooldownProxy;
import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.ProxyUtils;
import com.willfp.eco.util.optional.Prerequisite;

8
eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java → eco-util/src/main/java/com/willfp/eco/util/ProxyUtils.java
View File

@ -1,7 +1,8 @@
package com.willfp.eco.util;
import com.willfp.eco.core.proxy.AbstractProxy;
import com.willfp.eco.core.proxy.ProxyFactory;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.eco.util.proxy.AbstractProxy;
import com.willfp.eco.util.proxy.ProxyFactory;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
@ -9,11 +10,12 @@ import org.jetbrains.annotations.NotNull;
public class ProxyUtils {
/**
* Get the implementation of a specified proxy.
*
* @param proxyClass The proxy interface.
* @param <T> The type of the proxy.
* @return The proxy implementation.
*/
public @NotNull <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
return new ProxyFactory<>(proxyClass).getProxy();
return new ProxyFactory<>(AbstractEcoPlugin.getInstance(), proxyClass).getProxy();
}
}

13
eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java
View File

@ -11,8 +11,8 @@ import com.willfp.eco.util.bukkit.scheduling.EcoScheduler;
import com.willfp.eco.util.bukkit.scheduling.RunnableFactory;
import com.willfp.eco.util.bukkit.scheduling.Scheduler;
import com.willfp.eco.util.command.AbstractCommand;
import com.willfp.eco.util.config.updating.ConfigHandler;
import com.willfp.eco.util.config.Configs;
import com.willfp.eco.util.config.updating.ConfigHandler;
import com.willfp.eco.util.drops.internal.DropManager;
import com.willfp.eco.util.drops.internal.FastCollatedDropQueue;
import com.willfp.eco.util.events.armorequip.ArmorListener;
@ -79,6 +79,12 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
@Getter
private final int bStatsId;
/**
* The package where proxy implementations are.
*/
@Getter
private final String proxyPackage;
/**
* Set of external plugin integrations.
*/
@ -151,13 +157,16 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
* @param pluginName The name of the plugin.
* @param resourceId The spigot resource ID for the plugin.
* @param bStatsId The bStats resource ID for the plugin.
* @param proxyPackage The package where proxy implementations are stored.
*/
protected AbstractEcoPlugin(@NotNull final String pluginName,
final int resourceId,
final int bStatsId) {
final int bStatsId,
@NotNull final String proxyPackage) {
this.pluginName = pluginName;
this.resourceId = resourceId;
this.bStatsId = bStatsId;
this.proxyPackage = proxyPackage;
this.log = new EcoLogger(this);
this.scheduler = new EcoScheduler(this);

2
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java → eco-util/src/main/java/com/willfp/eco/util/proxy/AbstractProxy.java
View File

@ -1,4 +1,4 @@
package com.willfp.eco.core.proxy;
package com.willfp.eco.util.proxy;
public interface AbstractProxy {

2
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java → eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyConstants.java
View File

@ -1,4 +1,4 @@
package com.willfp.eco.core.proxy;
package com.willfp.eco.util.proxy;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;

13
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java → eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyFactory.java
View File

@ -1,11 +1,13 @@
package com.willfp.eco.core.proxy;
package com.willfp.eco.util.proxy;
import com.willfp.eco.util.internal.PluginDependent;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.IdentityHashMap;
import java.util.Map;
public class ProxyFactory<T extends AbstractProxy> {
public class ProxyFactory<T extends AbstractProxy> extends PluginDependent {
/**
* Cached proxy implementations in order to not perform expensive reflective class-finding.
*/
@ -19,9 +21,12 @@ public class ProxyFactory<T extends AbstractProxy> {
/**
* Create a new Proxy Factory for a specific type.
*
* @param plugin The plugin to create proxies for.
* @param proxyClass The class of the proxy interface.
*/
public ProxyFactory(@NotNull final Class<T> proxyClass) {
public ProxyFactory(@NotNull final AbstractEcoPlugin plugin,
@NotNull final Class<T> proxyClass) {
super(plugin);
this.proxyClass = proxyClass;
}
@ -37,7 +42,7 @@ public class ProxyFactory<T extends AbstractProxy> {
return cachedProxy;
}
String className = "com.willfp.eco.core.proxy." + ProxyConstants.NMS_VERSION + "." + proxyClass.getSimpleName().replace("Proxy", "");
String className = this.getPlugin().getProxyPackage() + "." + ProxyConstants.NMS_VERSION + "." + proxyClass.getSimpleName().replace("Proxy", "");
final Class<?> class2 = Class.forName(className);
Object instance = class2.getConstructor().newInstance();
if (proxyClass.isAssignableFrom(class2) && proxyClass.isInstance(instance)) {

2
eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/UnsupportedVersionException.java → eco-util/src/main/java/com/willfp/eco/util/proxy/UnsupportedVersionException.java
View File

@ -1,4 +1,4 @@
package com.willfp.eco.core.proxy;
package com.willfp.eco.util.proxy;
import org.jetbrains.annotations.NotNull;