1.18.1 changes (#49)

* optimized imports
* changed base directory
* fixed 1.18 dependency not working correctly
* disabled WorldEdit flag if FAWE is present
* added collision flag
* removed debug messages
* updated gradle wrapper
* updated CI Java version and distribution to 17 Zulu
* changed version schema
* changes to the bug report template
* Updated files
* re-added support for 1.17
* changed url in checklist
* Update gradle to v7.3.3
* updated spigradle to v2.3.3
* downgraded back to java 16
* updated example version
* Disable Block patch option
* added the ability to disable the patch for allow/deny block place/break flags
* removed FAWEManager
* removed FAWE Dependency
* #51: PAPI support suffix/prefix
* added missing dependency
* spigradle fix
* updated README.md
* updated build scripts
* simplify expressions
* updated to 1.18.1
* fix an issue that causes chat to not change for OP users
* removed annotation
* some small changes in fly flag
* downgraded spigradle back to v2.2.4

Author: Invvk

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -29,7 +29,7 @@ body:
       multiple: false
       options:
         - '1.17.1'
-        - '1.17'
+        - '1.18.1'
     validations:
       required: true
 
@@ -73,7 +73,7 @@ body:
     attributes:
       label: WGEF-Reborn version
       description: What version of WGEF-Reborn are you running? (`/version WGEF-REBORN`)
-      placeholder: "For example: WGEF-REBORN version 2.0.0"
+      placeholder: "For example: WGEF-REBORN version 2.2-beta-f2c5e86"
     validations:
       required: true
 
@@ -82,9 +82,9 @@ body:
       label: Checklist
       description: Make sure you have followed each of the steps outlined here.
       options:
-        - label: I'm using java 16+ and running my server in 1.17.1+
+        - label: I'm using java 16+ and running my server in 1.17+
           required: true
-        - label: I am using the newest build from https://github.com/Invvk/WorldGuardExtraFlagsPlugin/releases and the issue still persists.
+        - label: I am using the newest build from https://www.spigotmc.org/resources/96894/ and the issue still persists.
           required: true
 
   - type: textarea

.github/workflows/gradle.yml

@@ -17,9 +17,9 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: '16'
-        distribution: 'adopt'
+        distribution: 'zulu'
         cache: gradle
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew -Pbase117=jarFile build
+      run: ./gradlew -Pbase118=jarFile build

README.md

@@ -1,5 +1,29 @@
-# WorldGuardExtraFlags Reborn
+<div align="center">
+<h1> WorldGuard Extra Flags </h1>
 
-ORIGINAL: https://github.com/aromaa/WorldGuardExtraFlagsPlugin
+[![Discord](https://discordapp.com/api/guilds/892834164448063489/widget.png?style=shield)](https://discord.gg/xcFJvXYsnD) [![BStats](https://img.shields.io/bstats/servers/13119)](https://bstats.org/plugin/bukkit/WGEF-Reborn/13119)
 
-Spigot page: https://www.spigotmc.org/resources/beta-worldgaurdextraflags-reborn.96894/
+<a ref="https://github.com/aromaa/WorldGuardExtraFlagsPlugin">ORIGINAL</a> |
+<a ref="https://www.spigotmc.org/resources/96894/">SPIGOT PAGE</a> |
+<a ref="https://github.com/Invvk/WorldGuardExtraFlags/wiki">WIKI</a> |
+<a ref="https://github.com/Invvk/WorldGuardExtraFlags/wiki/FAQ">FAQ</a>
+
+<h2>Discription</h2>
+<p>WGEF is an extension to WorldGuard plugin, originally developed by aromaa. it offers variety of new features and flags.</p>
+
+<h2>System requirements</h2>
+<p>This plugin runs on spigot. Spigot forks without compiled NMS code are not supported. Officially supported servers are spigot and paper 1.17+. It is recommended to use Java 16+.</p>
+
+<h2>Community Servers</h2>
+<p>Servers that uses this plugin (contact me in discord to add your server): </p>
+- currently no servers wants to be listed :(
+
+<h2>Contributing</h2>
+<p>To contribute to this project, please make sure that you read <a href="https://github.com/Invvk/WorldGuardExtraFlags/blob/main/CODE_OF_CONDUCT.md"> CODE OF CONDUCT</a> first and follow all the rules there.</p> 
+<p>After you finish follow the <a href="https://github.com/Invvk/WorldGuardExtraFlags/blob/main/CONTRIBUTING.md">Contributing</a> page and make sure that you meet the requirement in order for your contribution to be accepted.</p>
+<p>Remember that by contributing, your changes will be also under the <a href="https://github.com/Invvk/WorldGuardExtraFlags/blob/main/LICENSE">MIT License</a>. if you don't agree with the MIT license, then please don't contribute!</p>
+
+<h2>Contact</h2>
+
+[![Discord Server](https://discordapp.com/api/guilds/892834164448063489/widget.png?style=banner3)](https://discord.gg/xcFJvXYsnD)
+</div>

WG7/src/main/java/io/github/invvk/wgef/v7/worldedit/fawe/FAWEManager.java

@@ -1,7 +1,6 @@
 package io.github.invvk.wgef.abstraction;
 
 import io.github.invvk.wgef.abstraction.dependencies.IEssentialsDependency;
-import io.github.invvk.wgef.abstraction.dependencies.IFAWEDependency;
 
 import java.util.Optional;
 
@@ -16,6 +15,5 @@ public interface IManager {
     IWGFork getFork();
 
     Optional<IEssentialsDependency> getEssentials();
-    Optional<IFAWEDependency> getFAWE();
 
 }

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/IManager.java

@@ -55,12 +55,11 @@ public static StateFlag.State queryState(Player player, World world, Set<Protect
     }
 
     public static <T> T queryValue(Player player, World world, Set<ProtectedRegion> regions, Flag<T> flag) {
-        return WGEFUtils.createFlagValueCalculator(player, world, regions, flag)
-                .queryValue(WGEFUtils.wrapPlayer(player), flag);
+        return WGEFUtils.createFlagValueCalculator(player, world, regions, flag).queryValue(WGEFUtils.wrapPlayer(player), flag);
     }
 
     public static <T> T queryValueUnchecked(Player player, World world, Set<ProtectedRegion> regions, Flag<T> flag) {
-        return WGEFUtils.createFlagValueCalculator(player, world, regions, flag).queryValue(WGEFUtils.wrapPlayer(player), flag);
+        return WGEFUtils.createFlagValueCalculatorUnchecked(world, regions, flag).queryValue(WGEFUtils.wrapPlayer(player), flag);
     }
 
     public static <T> FlagValueCalculator createFlagValueCalculator(Player player, World world, Set<ProtectedRegion> regions, Flag<T> flag) {
@@ -82,6 +81,12 @@ public static <T> FlagValueCalculator createFlagValueCalculator(Player player, W
         return new FlagValueCalculator(checkForRegions, global);
     }
 
+    public static <T> FlagValueCalculator createFlagValueCalculatorUnchecked(World world, Set<ProtectedRegion> regions, Flag<T> flag) {
+        final List<ProtectedRegion> checkForRegions = List.copyOf(regions);
+        ProtectedRegion global = WGEFUtils.getFork().getRegionContainer().get(world).getRegion(ProtectedRegion.GLOBAL_REGION);
+        return new FlagValueCalculator(checkForRegions, global);
+    }
+
     public static boolean isDeny(StateFlag.State state) {
         return state == StateFlag.State.DENY;
     }
@@ -95,4 +100,13 @@ public static boolean isFAWEPresent() {
         return true;
     }
 
+    public static boolean isPAPIPresent() {
+        try {
+            Class.forName("me.clip.placeholderapi.PlaceholderAPI");
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+        return true;
+    }
+
 }

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/WGEFUtils.java

@@ -64,6 +64,8 @@ public final class WGEFlags {
     public final static SetFlag<EntityType> ALLOW_ENTITY_PLACE = new SetFlag<EntityType>("allow-entity-place", new EntityTypeFlag(null));
     public final static SetFlag<EntityType> DENY_ENTITY_PLACE = new SetFlag<EntityType>("deny-entity-place", new EntityTypeFlag(null));
 
+    public final static BooleanFlag DISABLE_COLLISION = new BooleanFlag("disable-collision");
+
     public static Set<Flag<?>> values() {
         return Arrays.stream(WGEFlags.class.getFields())
                 .map(field -> {

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/dependencies/IFAWEDependency.java

@@ -0,0 +1,52 @@
+package io.github.invvk.wgef.abstraction.flags.handler;
+
+import org.bukkit.entity.Player;
+import org.bukkit.scoreboard.Scoreboard;
+import org.bukkit.scoreboard.Team;
+
+public final class CollisionTeamHandler {
+
+    public static final String TEAM_NAME = "WGEF_NO_COLLISION";
+
+    private Team team;
+
+    private final Player player;
+    private boolean contains;
+
+    public CollisionTeamHandler(Player player) {
+        this.player = player;
+    }
+
+    public void checkTeam() {
+        final Scoreboard scoreboard = this.getScoreboard();
+        this.team = scoreboard.getTeam(TEAM_NAME);
+        if (this.team == null) {
+            this.team = scoreboard.registerNewTeam(TEAM_NAME);
+        }
+        this.team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
+    }
+
+    public void add() {
+        this.checkTeam();
+        if (!this.team.hasEntry(player.getName()))
+            this.team.addEntry(player.getName());
+        this.contains = true;
+    }
+
+    public void remove() {
+        this.checkTeam();
+        if (this.team.hasEntry(player.getName()))
+            this.team.removeEntry(player.getName());
+
+        this.contains = false;
+    }
+
+    public boolean isContains() {
+        return contains;
+    }
+
+    public Scoreboard getScoreboard() {
+        return player.getScoreboard();
+    }
+
+}