Merge pull request #1 from MinestomPlugins/master

lots of stuff

Author: Codestech1

.github/workflows/gradle.yml

@@ -0,0 +1,7 @@
+FROM gitpod/workspace-full
+
+USER gitpod
+
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
+    sdk install java 18.0.1.fx-zulu && \
+    sdk default java 18.0.1.fx-zulu"

.gitpod.Dockerfile

@@ -0,0 +1,10 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+  - init: gradle build
+
+
+image:
+  file: .gitpod.Dockerfile

.gitpod.yml

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

.vscode/settings.json

@@ -1,4 +1,5 @@
 # MinestomWorldEdit
 WorldEdit Platform implementation for Minestom server software
 
-Get the artifact from the latest actions workflow
+## Known issues:
+The permission for //wand does not work, i have no idea why.

README.md

@@ -62,8 +62,8 @@ dependencies {
 	compileOnly 'com.github.Minestom:Minestom:-SNAPSHOT'
 	//compileOnly("net.pixelravens:PixelLib:b114")
 	implementation('com.google.guava:guava:31.1-jre')
-	implementation("com.sk89q.worldedit:worldedit-core:7.2.12")
-	implementation('org.spongepowered:configurate-yaml:4.1.2');
+	compileOnly("com.sk89q.worldedit:worldedit-core:7.2.12")
+	compileOnly('org.spongepowered:configurate-yaml:4.1.2');
 }
 
 shadowJar {
@@ -77,25 +77,4 @@ java {
 	toolchain {
 		languageVersion = JavaLanguageVersion.of(18)
 	}
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/MinestomPlugins/World-Edit")
-            credentials {
-                username = "Window5000"
-                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
-            }
-        }
-    }
-    publications {
-        gpr(MavenPublication) {
-		groupId 'me.window'
-            	artifactId 'worldedit'
-            	version '1.1'
-            	artifact jarArtifact
-        }
-    }
-}
+}

build.gradle

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradle/wrapper/gradle-wrapper.properties

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew

@@ -4,9 +4,13 @@
 
 public class MinestomPermissionProvider {
     public static boolean hasPermission(Player player, String permission) {
-        if (player.hasPermission("*") || player.hasPermission("worldedit.*"))
+        if (player.hasPermission("*") || player.hasPermission("worldedit.*") || player.getPermissionLevel() >= 4)
             return true;
         return player.hasPermission(permission);
     }
 
+    public static boolean hasWorldEditPermission(Player player) {
+        return player.hasPermission("*") || player.hasPermission("worldedit") || player.getPermissionLevel() >= 4;
+    }
+
 }

gradlew.bat

@@ -3,22 +3,37 @@
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
+import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.internal.command.CommandUtil;
+import io.github.openminigameserver.worldedit.MinestomWorldEdit;
+import io.github.openminigameserver.worldedit.platform.MinestomPlatform;
+import io.github.openminigameserver.worldedit.platform.actors.MinestomPlayer;
 import io.github.openminigameserver.worldedit.platform.adapters.MinestomAdapter;
+import net.kyori.adventure.text.Component;
+import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandSender;
+import net.minestom.server.command.ConsoleSender;
 import net.minestom.server.command.builder.Command;
 import net.minestom.server.command.builder.CommandContext;
 import net.minestom.server.command.builder.arguments.ArgumentStringArray;
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.command.builder.suggestion.SuggestionEntry;
 import net.minestom.server.entity.Player;
+import org.enginehub.piston.inject.InjectedValueStore;
+import org.enginehub.piston.inject.Key;
+import org.enginehub.piston.inject.MapBackedValueStore;
 import org.jetbrains.annotations.NotNull;
+import io.github.openminigameserver.worldedit.platform.adapters.MinestomPermissionProvider;
 
 import java.util.List;
+import java.util.Optional;
 
 public class WorldEditCommand extends Command {
+
+    org.enginehub.piston.Command cmd;
     public WorldEditCommand(org.enginehub.piston.Command command) {
         super(command.getName(), toPrimitiveArray(command.getAliases()));
+        cmd = command;
 
         setCondition((this::condition));
 
@@ -42,8 +57,11 @@ public WorldEditCommand(org.enginehub.piston.Command command) {
     }
 
     private boolean condition(final CommandSender sender, final String command) {
-        //TODO: Permission Check
-        return true;
+        if(sender instanceof ConsoleSender) return true;
+        InjectedValueStore store = MapBackedValueStore.create();
+        store.injectValue(Key.of(Actor.class), context ->
+                Optional.of(new MinestomPlayer(MinestomAdapter.platform, (Player) sender)));
+        return cmd.getCondition().satisfied(store);
     }
 
     @Override

src/main/java/io/github/openminigameserver/worldedit/platform/adapters/MinestomPermissionProvider.java

@@ -4,9 +4,20 @@
     "NickAc",
     "Moulberry",
     "Window5",
+    "MinestomPlugins",
     "HEROOSTECH",
     "CityWideMC"
   ],
   "version": "1.0.0",
-  "entrypoint": "io.github.openminigameserver.worldedit.MinestomWorldEdit"
+  "entrypoint": "io.github.openminigameserver.worldedit.MinestomWorldEdit",
+  "externalDependencies": {
+    "repositories": [
+      {"name": "sponge", "url": "https://repo.spongepowered.org/repository/maven-public/" },
+      {"name": "enginehub", "url": "https://maven.enginehub.org/repo/" }
+    ],
+    "artifacts": [
+      "org.spongepowered:configurate-yaml:4.1.2",
+      "com.sk89q.worldedit:worldedit-core:7.2.12"
+    ]
+  }
 }