From 1d9e8b60abd630854f2b72affbb58abc7c50dba2 Mon Sep 17 00:00:00 2001
From: Jordan <dordsor21@gmail.com>
Date: Sun, 12 May 2024 11:05:00 +0100
Subject: [PATCH] fix: add missing blocktypes and some minor cleanup (#2722)

- fixes #2713
---
 .../worldedit/world/block/BlockTypes.java     | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
index 4b3204be4..513a00557 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
@@ -483,6 +483,10 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType COPPER_GRATE = init();
     @Nullable
+    public static final BlockType COPPER_ORE = init();
+    @Nullable
+    public static final BlockType COPPER_TRAPDOOR = init();
+    @Nullable
     public static final BlockType CORNFLOWER = init();
     @Nullable
     public static final BlockType CRACKED_DEEPSLATE_BRICKS = init();
@@ -495,6 +499,8 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType CRACKED_STONE_BRICKS = init();
     @Nullable
+    public static final BlockType CRAFTER = init();
+    @Nullable
     public static final BlockType CRAFTING_TABLE = init();
     @Nullable
     public static final BlockType CREEPER_HEAD = init();
@@ -685,8 +691,6 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType DEEPSLATE_COPPER_ORE = init();
     @Nullable
-    public static final BlockType COPPER_TRAPDOOR = init();
-    @Nullable
     public static final BlockType DEEPSLATE_DIAMOND_ORE = init();
     @Nullable
     public static final BlockType DEEPSLATE_EMERALD_ORE = init();
@@ -747,8 +751,6 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType ENDER_CHEST = init();
     @Nullable
-    public static final BlockType EXPOSED_CHISELED_COPPER = init();
-    @Nullable
     public static final BlockType END_GATEWAY = init();
     @Nullable
     public static final BlockType END_PORTAL = init();
@@ -767,6 +769,8 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType END_STONE_BRICK_WALL = init();
     @Nullable
+    public static final BlockType EXPOSED_CHISELED_COPPER = init();
+    @Nullable
     public static final BlockType EXPOSED_COPPER = init();
     @Nullable
     public static final BlockType EXPOSED_COPPER_BULB = init();
@@ -836,6 +840,9 @@ public final class BlockTypes {
     public static final BlockType GRASS = init();
     @Nullable
     public static final BlockType GRASS_BLOCK = init();
+    @Deprecated
+    @Nullable
+    public static final BlockType GRASS_PATH = init();
     @Nullable
     public static final BlockType GRAVEL = init();
     @Nullable
@@ -925,8 +932,6 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType INFESTED_CRACKED_STONE_BRICKS = init();
     @Nullable
-    public static final BlockType CRAFTER = init();
-    @Nullable
     public static final BlockType INFESTED_DEEPSLATE = init();
     @Nullable
     public static final BlockType INFESTED_MOSSY_STONE_BRICKS = init();
@@ -1954,10 +1959,12 @@ public final class BlockTypes {
     @Nullable
     public static final BlockType TWISTING_VINES = init();
     @Nullable
-    public static final BlockType VERDANT_FROGLIGHT = init();
-    @Nullable
     public static final BlockType TWISTING_VINES_PLANT = init();
     @Nullable
+    public static final BlockType VAULT = init();
+    @Nullable
+    public static final BlockType VERDANT_FROGLIGHT = init();
+    @Nullable
     public static final BlockType VINE = init();
     @Nullable
     public static final BlockType VOID_AIR = init();
@@ -2026,7 +2033,7 @@ public final class BlockTypes {
     public static final BlockType WAXED_CUT_COPPER_SLAB = init();
     @Nullable
     public static final BlockType WAXED_CUT_COPPER_STAIRS = init();
-    @ Nullable
+    @Nullable
     public static final BlockType WAXED_EXPOSED_CHISELED_COPPER = init();
     @Nullable
     public static final BlockType WAXED_EXPOSED_COPPER = init();