FAWEMaskParser_GENERIC.java

BauSystem_Linkage/src/de/steamwar/linkage/types/FAWEMaskParser_GENERIC.java

@@ -0,0 +1,41 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class FAWEMaskParser_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "link";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        methodBuilder.addLine("if (org.bukkit.Bukkit.getPluginManager().getPlugin(\"FastAsyncWorldEdit\") != null) {");
+        methodBuilder.addLine("    " + s + ";");
+        methodBuilder.addLine("}");
+    }
+}

BauSystem_Linkage/src/de/steamwar/linkage/types/FAWEPatternParser_GENERIC.java

@@ -0,0 +1,41 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class FAWEPatternParser_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "link";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        methodBuilder.addLine("if (org.bukkit.Bukkit.getPluginManager().getPlugin(\"FastAsyncWorldEdit\") != null) {");
+        methodBuilder.addLine("    " + s + ";");
+        methodBuilder.addLine("}");
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java

@@ -19,27 +19,23 @@
 
 package de.steamwar.bausystem.features.worldedit.mask.above;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
-import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWEAboveMaskParser extends FAWEMaskParser {
-public class FAWEAboveMaskParser extends RichParser<Mask> implements Plain {
 
     public FAWEAboveMaskParser() {
-        super(WorldEdit.getInstance(), "#above");
+        super("#above");
-        WorldEditUtils.addMaskParser(this);
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java

@@ -19,27 +19,23 @@
 
 package de.steamwar.bausystem.features.worldedit.mask.below;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
-import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWEBelowMaskParser extends FAWEMaskParser {
-public class FAWEBelowMaskParser extends RichParser<Mask> implements Plain {
 
     public FAWEBelowMaskParser() {
-        super(WorldEdit.getInstance(), "#below");
+        super("#below");
-        WorldEditUtils.addMaskParser(this);
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard/CheckerboardMask.java

@@ -32,6 +32,7 @@ public class CheckerboardMask implements Mask {
 
     @Override
     public boolean test(BlockVector3 vector) {
+        if (size == 0) return true;
         return (vector.getBlockX() / size + vector.getBlockZ() / size) % 2 == 0;
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard/FAWECheckerboardMaskParser.java

@@ -19,27 +19,22 @@
 
 package de.steamwar.bausystem.features.worldedit.mask.checkerboard;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
-import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
-import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWECheckerboardMaskParser extends FAWEMaskParser {
-public class FAWECheckerboardMaskParser extends RichParser<Mask> implements Plain {
 
     public FAWECheckerboardMaskParser() {
-        super(WorldEdit.getInstance(), "#checkerboard");
+        super("#checkerboard");
-        WorldEditUtils.addMaskParser(this);
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/Checkerboard3DMask.java

@@ -32,6 +32,7 @@ public class Checkerboard3DMask implements Mask {
 
     @Override
     public boolean test(BlockVector3 vector) {
+        if (size == 0) return true;
         return (vector.getBlockX() / size + vector.getBlockY() / size + vector.getBlockZ() / size) % 2 == 0;
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java

@@ -19,27 +19,22 @@
 
 package de.steamwar.bausystem.features.worldedit.mask.checkerboard3d;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
-import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
-import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWECheckerboard3DMaskParser extends FAWEMaskParser {
-public class FAWECheckerboard3DMaskParser extends RichParser<Mask> implements Plain {
 
     public FAWECheckerboard3DMaskParser() {
-        super(WorldEdit.getInstance(), "#checkerboard3d");
+        super("#checkerboard3d");
-        WorldEditUtils.addMaskParser(this);
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java

@@ -19,27 +19,22 @@
 
 package de.steamwar.bausystem.features.worldedit.mask.grid;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
-import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
-import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWEGridMaskParser extends FAWEMaskParser {
-public class FAWEGridMaskParser extends RichParser<Mask> implements Plain {
 
     public FAWEGridMaskParser() {
-        super(WorldEdit.getInstance(), "#grid");
+        super("#grid");
-        WorldEditUtils.addMaskParser(this);
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java

@@ -19,77 +19,26 @@
 
 package de.steamwar.bausystem.features.worldedit.pattern.gradient;
 
-import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.Region;
+import de.steamwar.bausystem.features.worldedit.utils.FAWEPatternParser;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Plain;
 import org.bukkit.Axis;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Stream;
 
 @Linked
-@PluginCheck("FastAsyncWorldEdit")
+public class FAWEGradientPatternParser extends FAWEPatternParser {
-public class FAWEGradientPatternParser extends RichParser<Pattern> implements Plain {
 
     public FAWEGradientPatternParser() {
-        super(WorldEdit.getInstance(), "#gradient");
+        super("#gradient");
-        WorldEditUtils.addPatternParser(this);
     }
 
-    /*
-    @Override
-    public Pattern parseFromInput(String s, ParserContext parserContext) throws InputParseException {
-        System.out.println("parse " + s);
-        if (!s.startsWith("#gradient")) return null;
-        Extent extent = parserContext.requireExtent();
-        Axis axis = null;
-        if (s.startsWith("#gradientx")) {
-            axis = Axis.X;
-        } else if (s.startsWith("#gradienty")) {
-            axis = Axis.Y;
-        } else if (s.startsWith("#gradientz")) {
-            axis = Axis.Z;
-        }
-        if (axis == null) {
-            throw new InputParseException("No axis given for gradient pattern");
-        }
-        s = s.substring(10);
-        if (!s.startsWith("[") && s.endsWith("]")) {
-            throw new InputParseException("No pattern given for gradient pattern");
-        }
-        s = s.substring(1, s.length() - 1);
-        String[] patterns = s.split("]\\[");
-        if (patterns.length < 2) {
-            throw new InputParseException("Not enough patterns given for gradient pattern");
-        }
-        if (patterns.length > 2) {
-            throw new InputParseException("Too many patterns given for gradient pattern");
-        }
-        Pattern from = WorldEditUtils.getPatternFactory().parseFromInput(patterns[0], parserContext);
-        Pattern to = WorldEditUtils.getPatternFactory().parseFromInput(patterns[1], parserContext);
-        int size = 0;
-        switch (axis) {
-            case X:
-                size = extent.getMaximumPoint().getBlockX() - extent.getMinimumPoint().getBlockX();
-                break;
-            case Y:
-                size = extent.getMaximumPoint().getBlockY() - extent.getMinimumPoint().getBlockY();
-                break;
-            case Z:
-                size = extent.getMaximumPoint().getBlockZ() - extent.getMinimumPoint().getBlockZ();
-                break;
-        }
-        return new GradientPattern(axis, from, to, extent.getMinimumPoint(), size);
-    }
-     */
-
     @Override
     protected Stream<String> getSuggestions(String input, int index) {
         if (index == 0) {

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEMaskParser.java

@@ -0,0 +1,33 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.worldedit.utils;
+
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.function.mask.Mask;
+import de.steamwar.bausystem.utils.WorldEditUtils;
+
+public abstract class FAWEMaskParser extends RichParser<Mask> {
+
+    protected FAWEMaskParser(String... aliases) {
+        super(WorldEdit.getInstance(), aliases);
+        WorldEditUtils.addMaskParser(this);
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEPatternParser.java

@@ -0,0 +1,33 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.worldedit.utils;
+
+import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import de.steamwar.bausystem.utils.WorldEditUtils;
+
+public abstract class FAWEPatternParser extends RichParser<Pattern> {
+
+    protected FAWEPatternParser(String... aliases) {
+        super(WorldEdit.getInstance(), aliases);
+        WorldEditUtils.addPatternParser(this);
+    }
+}