Added a brush for biomes (#1491)

* Added a brush for biomes

* IntelliJ reformat

* Move the warning

* Update worldedit-core/src/main/resources/lang/strings.json

Co-authored-by: Octavia Togami <[email protected]>

* Use BiomeFactory instead

Co-authored-by: Octavia Togami <[email protected]>

Author: 2 people

worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java

@@ -93,6 +93,8 @@
 import com.sk89q.worldedit.function.Contextual;
 import com.sk89q.worldedit.function.factory.Apply;
 import com.sk89q.worldedit.function.factory.ApplyLayer;
+import com.sk89q.worldedit.function.factory.ApplyRegion;
+import com.sk89q.worldedit.function.factory.BiomeFactory;
 import com.sk89q.worldedit.function.factory.Deform;
 import com.sk89q.worldedit.function.factory.Paint;
 import com.sk89q.worldedit.function.factory.Snow;
@@ -111,7 +113,9 @@
 import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
@@ -1552,6 +1556,26 @@ public void butcherBrush(
         set(context, new ButcherBrush(flags), "worldedit.brush.butcher").setSize(radius);
     }
 
+    @Command(name = "biome",
+            desc = "Biome brush, sets biomes in the area"
+    )
+    @CommandPermissions("worldedit.brush.biome")
+    public void biome(
+            Player player, LocalSession localSession,
+            @Arg(desc = "The shape of the region")
+                    RegionFactory shape,
+            @Arg(desc = "The size of the brush", def = "5")
+                    double radius,
+            @Arg(desc = "The biome type")
+                    BiomeType biomeType
+    ) throws WorldEditException {
+        setOperationBasedBrush(
+                player, localSession, radius,
+                new ApplyRegion(new BiomeFactory(biomeType)), shape, "worldedit.brush.biome"
+        );
+        player.printInfo(TranslatableComponent.of("worldedit.setbiome.warning"));
+    }
+
     //FAWE start
     public BrushSettings process(Player player, Arguments arguments, BrushSettings settings)
             throws WorldEditException {
@@ -1596,13 +1620,12 @@ public BrushSettings set(InjectedValueAccess context, Brush brush, String permis
     }
     //FAWE end
 
-    static void setOperationBasedBrush(
-            Player player, LocalSession session, double radius,
-            Contextual<? extends Operation> factory,
-            RegionFactory shape,
-            String permission
-    ) throws WorldEditException {
-        WorldEdit.getInstance().checkMaxBrushRadius(radius, player);
+
+    static void setOperationBasedBrush(Player player, LocalSession session, double radius,
+                                        Contextual<? extends Operation> factory,
+                                        RegionFactory shape,
+                                        String permission) throws WorldEditException {
+        WorldEdit.getInstance().checkMaxBrushRadius(radius);
         BrushTool tool = session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType());
         tool.setSize(radius);
         tool.setFill(null);

worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/BiomeFactory.java

@@ -0,0 +1,45 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.function.factory;
+
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.function.biome.BiomeReplace;
+import com.sk89q.worldedit.function.pattern.BiomePattern;
+
+public class BiomeFactory implements Contextual<RegionFunction> {
+
+    private final BiomePattern biomeType;
+
+    public BiomeFactory(BiomePattern biomeType) {
+        this.biomeType = biomeType;
+    }
+
+    @Override
+    public RegionFunction createFromContext(EditContext context) {
+        return new BiomeReplace(context.getDestination(), this.biomeType);
+    }
+
+    @Override
+    public String toString() {
+        return "set biome";
+    }
+}

worldedit-core/src/main/resources/lang/strings.json

@@ -298,6 +298,7 @@
   "worldedit.brush.none.equip": "Brush unbound from your current item.",
   "worldedit.brush.none.equipped": "You have no brush bound to your current item. Try /brush sphere for a basic brush.",
   "worldedit.setbiome.changed": "Biomes were changed in {0} columns. You may have to rejoin your game (or close and reopen your world) to see a change.",
+  "worldedit.setbiome.warning": "You may have to re-join your game (or close and re-open your world) to see changes.",
   "worldedit.setbiome.not-locatable": "Command sender must be present in the world to use the -p flag.",
   "worldedit.drawsel.disabled": "Server CUI disabled.",
   "worldedit.drawsel.enabled": "Server CUI enabled. This only supports cuboid regions, with a maximum size of {0}x{1}x{2}.",