diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ff614751..fc5b35cc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v2
- name: Setup Java JDK
- uses: actions/setup-java@v2.2.0
+ uses: actions/setup-java@v2.3.0
with:
# The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
java-version: 11
diff --git a/.github/workflows/java11-maven.yml b/.github/workflows/java11-maven.yml
index 84b38f98..967abde2 100644
--- a/.github/workflows/java11-maven.yml
+++ b/.github/workflows/java11-maven.yml
@@ -13,7 +13,7 @@ jobs:
# Java 11 Builds
- name: Set up JDK 11
- uses: actions/setup-java@v2.2.0
+ uses: actions/setup-java@v2.3.0
with:
java-version: 11
distribution: 'adopt'
diff --git a/.github/workflows/java16-maven.yml b/.github/workflows/java16-maven.yml
index c37d7521..92896df8 100644
--- a/.github/workflows/java16-maven.yml
+++ b/.github/workflows/java16-maven.yml
@@ -13,7 +13,7 @@ jobs:
# Java 16 Builds
- name: Set up JDK 16
- uses: actions/setup-java@v2.2.0
+ uses: actions/setup-java@v2.3.0
with:
java-version: 16
distribution: 'adopt'
diff --git a/pom.xml b/pom.xml
index 0f45f0cc..dc0dfbdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,10 @@
+
- jitpack.io
- https://jitpack.io
+ totalfreedom-development
+ https://atlasmedia.jfrog.io/artifactory/totalfreedom-development/
@@ -101,19 +102,11 @@
- papermc
- https://papermc.io/repo/repository/maven-public/
-
-
-
- ess-repo
- https://ci.ender.zone/plugin/repository/everything/
+ esentialsx-repo
+ https://repo.essentialsx.net/releases/
-
- total-freedom-libs-snapshot-local
- https://atlasmedia.jfrog.io/artifactory/total-freedom-libs-snapshot-local/
-
+
@@ -176,14 +169,7 @@
com.sk89q.worldedit
worldedit-bukkit
- 7.3.0-SNAPSHOT
- provided
-
-
-
- net.ess3
- EssentialsX
- 2.18.2
+ 7.2.4
provided
@@ -221,12 +207,12 @@
v1.9
provided
-
+
- net.goldtreeservers
- worldguardextraflags
- 4.0.0
- provided
+ net.ess3
+ EssentialsX
+ 2.18.2
+ compile
@@ -263,12 +249,14 @@
3.1.2
compile
+
org.junit.jupiter
junit-jupiter
5.4.2
compile
+
org.eclipse.sisu
org.eclipse.sisu.inject
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
deleted file mode 100644
index 7cf2334f..00000000
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Make a WorldGuard region for an OP.", usage = "/ ", aliases = "mor")
-public class Command_makeopregion extends FreedomCommand
-{
-
- final Map, Object> flags = new HashMap, Object>()
- {{
- put(Flags.BLOCK_PLACE, StateFlag.State.ALLOW);
- put(Flags.BLOCK_BREAK, StateFlag.State.ALLOW);
- put(Flags.BUILD, StateFlag.State.ALLOW);
- put(Flags.PLACE_VEHICLE, StateFlag.State.ALLOW);
- put(Flags.DESTROY_VEHICLE, StateFlag.State.ALLOW);
- put(Flags.ENTITY_ITEM_FRAME_DESTROY, StateFlag.State.ALLOW);
- put(Flags.ENTITY_PAINTING_DESTROY, StateFlag.State.ALLOW);
- put(net.goldtreeservers.worldguardextraflags.flags.Flags.WORLDEDIT, StateFlag.State.ALLOW);
- }};
-
- public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
- {
- if (args.length < 2)
- {
- return false;
- }
-
- final Player player = getPlayer(args[0]);
-
- if (player == null)
- {
- msg(FreedomCommand.PLAYER_NOT_FOUND);
- return true;
- }
-
- String name = args[1];
-
- LocalSession session = plugin.web.getWorldEditPlugin().getSession(playerSender);
-
- Region selection;
-
- try
- {
- selection = session.getSelection(session.getSelectionWorld());
- }
- catch (IncompleteRegionException e)
- {
- msg("Please make a WorldEdit selection", ChatColor.RED);
- return true;
- }
-
- if (selection == null)
- {
- msg("Please make a WorldEdit selection", ChatColor.RED);
- return true;
- }
-
- ProtectedRegion region = new ProtectedCuboidRegion(name, selection.getMinimumPoint(), selection.getMaximumPoint());
-
- DefaultDomain owners = new DefaultDomain();
- owners.addPlayer(playerSender.getName());
- owners.addPlayer(player.getName());
- region.setOwners(owners);
- region.setFlags(flags);
-
- for (Flag> flag : flags.keySet())
- {
- region.setFlag(flag.getRegionGroupFlag(), RegionGroup.MEMBERS);
- }
-
- RegionManager regionManager = plugin.wgb.getRegionManager(playerSender.getWorld());
-
- regionManager.addRegion(region);
-
- msg("Successfully created the region '" + name + "' for " + player.getName(), ChatColor.GREEN);
- return true;
- }
-}
\ No newline at end of file