Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Refactoring to use PluginDependent<T extends EcoPlugin> and updated CombatLogX

Browse Source
This commit is contained in:
Auxilor
2021-07-05 11:41:26 +02:00
parent f3a6861bc6
commit a21ecfbdde
20 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java
View File

@@ -31,8 +31,8 @@ import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix;
import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP;
import com.willfp.eco.spigot.integrations.anticheat.AnticheatSpartan;
import com.willfp.eco.spigot.integrations.anticheat.AnticheatVulcan;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogX_V10;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogX_V11;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV10;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV11;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefFactionsUUID;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefGriefPrevention;
import com.willfp.eco.spigot.integrations.antigrief.AntigriefKingdoms;
@@ -126,11 +126,11 @@ public class EcoSpigotPlugin extends EcoPlugin {
String pluginVersion = plugin_CombatLogX.getDescription().getVersion();
if (pluginVersion.startsWith("10")) {
AntigriefManager.register(new AntigriefCombatLogX_V10());
AntigriefManager.register(new AntigriefCombatLogXV10());
}
if(pluginVersion.startsWith("11")) {
AntigriefManager.register(new AntigriefCombatLogX_V11());
AntigriefManager.register(new AntigriefCombatLogXV11());
}
}),

2
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
public class EntityDeathByEntityListeners extends PluginDependent implements Listener {
public class EntityDeathByEntityListeners extends PluginDependent<EcoPlugin> implements Listener {
/**
* The events currently being built.
*/

2
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/gui/GUIListener.java
View File

@@ -13,7 +13,7 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.jetbrains.annotations.NotNull;
public class GUIListener extends PluginDependent implements Listener {
public class GUIListener extends PluginDependent<EcoPlugin> implements Listener {
/**
* Pass an {@link EcoPlugin} in order to interface with it.
*

19
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX_V10.java → eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.java
View File

@@ -1,22 +1,21 @@
package com.willfp.eco.spigot.integrations.antigrief;
import java.util.Optional;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.SirBlobman.combatlogx.api.ICombatLogX;
import com.SirBlobman.combatlogx.api.expansion.Expansion;
import com.SirBlobman.combatlogx.api.expansion.ExpansionManager;
import com.SirBlobman.combatlogx.expansion.newbie.helper.NewbieHelper;
import com.SirBlobman.combatlogx.expansion.newbie.helper.listener.ListenerPVP;
import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AntigriefCombatLogX_V10 implements AntigriefWrapper {
import java.util.Optional;
public class AntigriefCombatLogXV10 implements AntigriefWrapper {
/**
* Instance of CombatLogX.
*/
@@ -25,7 +24,7 @@ public class AntigriefCombatLogX_V10 implements AntigriefWrapper {
/**
* Create new CombatLogX antigrief.
*/
public AntigriefCombatLogX_V10() {
public AntigriefCombatLogXV10() {
this.instance = (ICombatLogX) Bukkit.getPluginManager().getPlugin("CombatLogX");
}

24
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX_V11.java → eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.java
View File

@@ -1,24 +1,22 @@
package com.willfp.eco.spigot.integrations.antigrief;
import java.util.Optional;
import com.github.sirblobman.combatlogx.api.ICombatLogX;
import com.github.sirblobman.combatlogx.api.expansion.Expansion;
import com.github.sirblobman.combatlogx.api.expansion.ExpansionManager;
import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper;
import combatlogx.expansion.newbie.helper.NewbieHelperExpansion;
import combatlogx.expansion.newbie.helper.manager.PVPManager;
import combatlogx.expansion.newbie.helper.manager.ProtectionManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.github.sirblobman.combatlogx.api.ICombatLogX;
import com.github.sirblobman.combatlogx.api.expansion.Expansion;
import com.github.sirblobman.combatlogx.api.expansion.ExpansionManager;
import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper;
import combatlogx.expansion.newbie.helper.NewbieHelperExpansion;
import combatlogx.expansion.newbie.helper.manager.PVPManager;
import combatlogx.expansion.newbie.helper.manager.ProtectionManager;
import org.jetbrains.annotations.NotNull;
public class AntigriefCombatLogX_V11 implements AntigriefWrapper {
import java.util.Optional;
public class AntigriefCombatLogXV11 implements AntigriefWrapper {
/**
* Instance of CombatLogX.
*/
@@ -27,7 +25,7 @@ public class AntigriefCombatLogX_V11 implements AntigriefWrapper {
/**
* Create new CombatLogX antigrief.
*/
public AntigriefCombatLogX_V11() {
public AntigriefCombatLogXV11() {
this.instance = (ICombatLogX) Bukkit.getPluginManager().getPlugin("CombatLogX");
}

2
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java
View File

@@ -12,7 +12,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AntigriefLands extends PluginDependent implements AntigriefWrapper {
public class AntigriefLands extends PluginDependent<EcoPlugin> implements AntigriefWrapper {
/**
* Lands integration.
*/

2
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java
View File

@@ -21,7 +21,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapedRecipe;
import org.jetbrains.annotations.NotNull;
public class ShapedRecipeListener extends PluginDependent implements Listener {
public class ShapedRecipeListener extends PluginDependent<EcoPlugin> implements Listener {
/**
* Pass an {@link EcoPlugin} in order to interface with it.
*