Fixed vanilla cacti not being cancelled

Author: supermassimo

gradle.properties

@@ -1,6 +1,6 @@
 modName=DynamicTreesPlus
 modId=dynamictreesplus
-modVersion=1.2.0-BETA3
+modVersion=1.2.0-BETA4
 group=com.ferreusveritas.dynamictreesplus
 
 mcVersion=1.20.1

src/main/java/com/ferreusveritas/dynamictreesplus/init/DTPRegistries.java

@@ -96,12 +96,12 @@ public static void registerSpeciesType(final TypeRegistryEvent<Species> event) {
     }
 
     @SubscribeEvent
-    public static void onFeatureCancellerRegistry(final com.ferreusveritas.dynamictrees.api.registry.RegistryEvent<FeatureCanceller> event) {
+    public static void onFeatureCancellerRegistry(final RegistryEvent<FeatureCanceller> event) {
         event.getRegistry().registerAll(new CactusFeatureCanceller<>(DynamicTreesPlus.location("cactus"), CactusBlock.class));
     }
 
     @SubscribeEvent
-    public static void onMushroomShapeKitRegistry(final com.ferreusveritas.dynamictrees.api.registry.RegistryEvent<MushroomShapeKit> event) {
+    public static void onMushroomShapeKitRegistry(final RegistryEvent<MushroomShapeKit> event) {
         MushroomShapeKits.register(event.getRegistry());
     }
 

src/main/resources/trees/dynamictreesplus/world_gen/feature_cancellers.json

@@ -1,7 +1,7 @@
 [
   {
     "__comment": "Cancel standard cactus features from the desert and badlands.",
-    "select": { "tag": "#(minecraft:is_badlands)|(forge:is_desert)" },
+    "select": { "OR": [{"tag": "#minecraft:is_badlands"},{"tag": "#forge:is_desert"}] },
     "cancellers": {
       "type": "dynamictreesplus:cactus",
       "namespace": "minecraft"