fixed tags and some worldgen issues

build.gradle

@@ -80,6 +80,24 @@ minecraft {
                 }
             }
         }
+
+        data {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
+            args '--mod', 'dtbop', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                dtbop {
+                    source sourceSets.main
+                }
+            }
+        }
     }
 }
 

src/main/java/therealeststu/dtbop/genfeature/DTBOPGenFeatures.java

@@ -1,19 +1,36 @@
 package therealeststu.dtbop.genfeature;
 
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.init.ModBiomes;
 import com.ferreusveritas.dynamictrees.api.registry.IRegistry;
 import com.ferreusveritas.dynamictrees.systems.genfeatures.GenFeature;
 import com.ferreusveritas.dynamictrees.systems.genfeatures.VinesGenFeature;
+import com.ferreusveritas.dynamictrees.systems.genfeatures.config.ConfiguredGenFeature;
+import com.ferreusveritas.dynamictrees.trees.Species;
+import com.ferreusveritas.dynamictrees.util.SafeChunkBounds;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IWorld;
+import net.minecraft.world.biome.Biome;
 import therealeststu.dtbop.DynamicTreesBOP;
 
+import java.util.List;
+import java.util.Objects;
+
 public class DTBOPGenFeatures {
 
     public static final GenFeature ALT_LEAVES = new AlternativeLeavesGenFeature(new ResourceLocation(DynamicTreesBOP.MOD_ID, "alt_leaves"));
     public static final GenFeature EXTRA_FLARE_BOTTOM = new ExtraBottomFlareGenFeature(new ResourceLocation(DynamicTreesBOP.MOD_ID, "extra_bottom_flare"));
-    public static final GenFeature VINES_2 = new VinesGenFeature(new ResourceLocation(DynamicTreesBOP.MOD_ID, "vines_2")); //a second vines gen feature so we can have multiple vine types in the same tree
+    public static final GenFeature VINES_DEEP_BAYOU = new VinesGenFeature(new ResourceLocation(DynamicTreesBOP.MOD_ID, "vines_deep_bayou")){
+        @Override public boolean postGeneration(ConfiguredGenFeature<?> configuredGenFeature, IWorld world, BlockPos rootPos, Species species, Biome biome, int radius, List<BlockPos> endPoints, SafeChunkBounds safeBounds, BlockState initialDirtState, Float seasonValue, Float seasonFruitProductionFactor) {
+            if (!Objects.requireNonNull(world.getBiome(rootPos).getRegistryName()).toString().equals("biomesoplenty:deep_bayou")) return false;
+            return super.postGeneration(configuredGenFeature, world, rootPos, species, biome, radius, endPoints, safeBounds, initialDirtState, seasonValue, seasonFruitProductionFactor);
+        }
+    }; //vines that only appear in
 
     public static void register(final IRegistry<GenFeature> registry) {
-        registry.registerAll(ALT_LEAVES, EXTRA_FLARE_BOTTOM, VINES_2);
+        registry.registerAll(ALT_LEAVES, EXTRA_FLARE_BOTTOM, VINES_DEEP_BAYOU);
     }
 
 }

src/main/resources/data/dynamictrees/tags/blocks/branches.json

@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-    "dtbop:burnt_branch",
-    "dtbop:hellbark_branch"
+    "dtbop:hellbark_branch",
+    "dtbop:burnt_branch"
   ]
 }

src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json

@@ -1,15 +1,15 @@
 {
   "replace": false,
   "values": [
-    "dtbop:cherry_branch",
+    "dtbop:mahogany_branch",
+    "dtbop:magic_branch",
     "dtbop:dead_branch",
+    "dtbop:redwood_branch",
     "dtbop:fir_branch",
-    "dtbop:jacaranda_branch",
-    "dtbop:magic_branch",
-    "dtbop:mahogany_branch",
     "dtbop:palm_branch",
-    "dtbop:redwood_branch",
-    "dtbop:umbran_branch",
-    "dtbop:willow_branch"
+    "dtbop:cherry_branch",
+    "dtbop:willow_branch",
+    "dtbop:jacaranda_branch",
+    "dtbop:umbran_branch"
   ]
 }

src/main/resources/data/dynamictrees/tags/blocks/leaves.json

@@ -1,36 +1,36 @@
 {
   "replace": false,
   "values": [
-    "dtbop:acacia_twiglet_leaves",
-    "dtbop:cypress_willow_leaves",
-    "dtbop:dark_oak_twiglet_leaves",
+    "dtbop:willow_leaves",
+    "dtbop:sparse_acacia_leaves",
+    "dtbop:sparse_oak_leaves",
     "dtbop:dark_poplar_leaves",
-    "dtbop:dying_leaves",
-    "dtbop:fir_leaves",
+    "dtbop:dark_oak_twiglet_leaves",
+    "dtbop:maple_twiglet_leaves",
     "dtbop:flowering_oak_leaves",
+    "dtbop:fir_leaves",
+    "dtbop:poplar_leaves",
+    "dtbop:dying_leaves",
+    "dtbop:white_cherry_leaves",
+    "dtbop:mahogany_leaves",
+    "dtbop:redwood_leaves",
+    "dtbop:jungle_twiglet_leaves",
     "dtbop:hellbark_leaves",
-    "dtbop:hellbark_bush_leaves",
+    "dtbop:pink_cherry_leaves",
+    "dtbop:umbran_leaves",
+    "dtbop:cypress_willow_leaves",
     "dtbop:jacaranda_leaves",
-    "dtbop:jungle_twiglet_leaves",
-    "dtbop:magic_poplar_leaves",
     "dtbop:maple_leaves",
-    "dtbop:maple_twiglet_leaves",
-    "dtbop:mahogany_leaves",
-    "dtbop:mega_dark_oak_leaves",
-    "dtbop:oak_twiglet_leaves",
-    "dtbop:orange_autumn_leaves",
     "dtbop:palm_leaves",
-    "dtbop:pink_cherry_leaves",
-    "dtbop:poplar_leaves",
+    "dtbop:magic_poplar_leaves",
+    "dtbop:orange_autumn_leaves",
+    "dtbop:yellow_autumn_leaves",
     "dtbop:rainbow_birch_leaves",
-    "dtbop:redwood_leaves",
-    "dtbop:sparse_acacia_leaves",
-    "dtbop:sparse_oak_leaves",
+    "dtbop:acacia_twiglet_leaves",
     "dtbop:spruce_poplar_leaves",
-    "dtbop:spruce_twiglet_leaves",
-    "dtbop:umbran_leaves",
-    "dtbop:white_cherry_leaves",
-    "dtbop:willow_leaves",
-    "dtbop:yellow_autumn_leaves"
+    "dtbop:mega_dark_oak_leaves",
+    "dtbop:hellbark_bush_leaves",
+    "dtbop:oak_twiglet_leaves",
+    "dtbop:spruce_twiglet_leaves"
   ]
 }

src/main/resources/data/dynamictrees/tags/blocks/saplings.json

@@ -1,25 +1,25 @@
 {
   "replace": false,
   "values": [
-    "dtbop:dark_poplar_sapling",
+    "dtbop:yellow_autumn_sapling",
+    "dtbop:mahogany_sapling",
+    "dtbop:willow_sapling",
+    "dtbop:redwood_sapling",
     "dtbop:dying_sapling",
-    "dtbop:fir_sapling",
-    "dtbop:flowering_oak_sapling",
     "dtbop:hellbark_sapling",
-    "dtbop:jacaranda_sapling",
+    "dtbop:pink_cherry_sapling",
+    "dtbop:fir_sapling",
+    "dtbop:palm_sapling",
     "dtbop:magic_poplar_sapling",
-    "dtbop:maple_sapling",
-    "dtbop:mahogany_sapling",
+    "dtbop:dark_poplar_sapling",
+    "dtbop:jacaranda_sapling",
+    "dtbop:umbran_sapling",
+    "dtbop:rainbow_birch_sapling",
     "dtbop:orange_autumn_sapling",
-    "dtbop:palm_sapling",
-    "dtbop:pink_cherry_sapling",
+    "dtbop:maple_sapling",
     "dtbop:poplar_sapling",
-    "dtbop:rainbow_birch_sapling",
-    "dtbop:redwood_sapling",
     "dtbop:spruce_poplar_sapling",
-    "dtbop:umbran_sapling",
-    "dtbop:white_cherry_sapling",
-    "dtbop:willow_sapling",
-    "dtbop:yellow_autumn_sapling"
+    "dtbop:flowering_oak_sapling",
+    "dtbop:white_cherry_sapling"
   ]
 }

src/main/resources/data/dynamictrees/tags/blocks/stripped_branches.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "dtbop:stripped_hellbark_branch"
+  ]
+}

src/main/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json

@@ -0,0 +1,15 @@
+{
+  "replace": false,
+  "values": [
+    "dtbop:stripped_mahogany_branch",
+    "dtbop:stripped_magic_branch",
+    "dtbop:stripped_dead_branch",
+    "dtbop:stripped_redwood_branch",
+    "dtbop:stripped_fir_branch",
+    "dtbop:stripped_palm_branch",
+    "dtbop:stripped_cherry_branch",
+    "dtbop:stripped_willow_branch",
+    "dtbop:stripped_jacaranda_branch",
+    "dtbop:stripped_umbran_branch"
+  ]
+}

src/main/resources/data/dynamictrees/tags/items/seeds.json

@@ -1,25 +1,25 @@
 {
   "replace": false,
   "values": [
-    "dtbop:dark_poplar_seed",
+    "dtbop:yellow_autumn_seed",
+    "dtbop:mahogany_seed",
+    "dtbop:willow_seed",
+    "dtbop:redwood_seed",
     "dtbop:dying_seed",
-    "dtbop:fir_seed",
-    "dtbop:flowering_oak_seed",
     "dtbop:hellbark_seed",
-    "dtbop:jacaranda_seed",
+    "dtbop:pink_cherry_seed",
+    "dtbop:fir_seed",
+    "dtbop:palm_seed",
     "dtbop:magic_poplar_seed",
-    "dtbop:maple_seed",
-    "dtbop:mahogany_seed",
+    "dtbop:dark_poplar_seed",
+    "dtbop:jacaranda_seed",
+    "dtbop:umbran_seed",
+    "dtbop:rainbow_birch_seed",
     "dtbop:orange_autumn_seed",
-    "dtbop:palm_seed",
-    "dtbop:pink_cherry_seed",
+    "dtbop:maple_seed",
     "dtbop:poplar_seed",
-    "dtbop:rainbow_birch_seed",
-    "dtbop:redwood_seed",
     "dtbop:spruce_poplar_seed",
-    "dtbop:umbran_seed",
-    "dtbop:white_cherry_seed",
-    "dtbop:willow_seed",
-    "dtbop:yellow_autumn_seed"
+    "dtbop:flowering_oak_seed",
+    "dtbop:white_cherry_seed"
   ]
 }

src/main/resources/trees/dtbop/families/burnt.json

@@ -3,5 +3,6 @@
   "common_species": "dtbop:burnt",
   "primitive_log": "biomesoplenty:stripped_hellbark_log",
   "generate_stripped_branch": false,
+  "fire_proof": true,
   "max_branch_radius": 8
 }

src/main/resources/trees/dtbop/jo_codes/cypress_willow.txt

@@ -21,7 +21,7 @@
 7:JJJJOJLxxxxxxxb6+fvkx6+cntx96ynv18y87zxxr87z8+vknuZPyxJPVPpOON79z6
 7:JJJxJxzxxxnc87+WJxx8689xJx99z+Xvmbz88xJ+XneeePnvkz8n
 7:JJJJJJxJxJxJxxxxx+XvzfmXny9p+bnmXk+Sx+X189zftxfy99yN9zfvkxxxXk6Xz8y89yV9xxxPvXbJ
-7:JJJJJJP
+7:JJJxJxJxOOOPvzfnyXvy+efvnXWXmJ8
 7:JJJxJxOOOOOPXzf1y98XSx88mOfXi+bzOPn1PnyyvntzJ+Xt8WSp8xXnmZPyWK88mb+Xn
 7:JJJxJOJxx+fX1y98XmePb8xXi6yxOV8x86n1xJPvmPmXj
 7:JJJJOJOOJxxx+X187+X1z9x68z8nzeOL8nzz89+tzN98R6yxxXvyvnty98mJXzd8mJ+fy8