From 59f87b861fc5ebbe4572eab25fd1f2023f198647 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 16 Jul 2023 02:28:04 +0300
Subject: [PATCH 01/10] Update Loom and LVF

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 89a4159..53c20c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
-    id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
+    id 'fabric-loom' version '1.3-SNAPSHOT'
+    id 'io.github.juuxel.loom-vineflower' version '1.11.0'
     id 'maven-publish'
 }
 

From 0b20789a8240c118b47a03269cc153fa4dc93123 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 16 Jul 2023 02:20:59 +0300
Subject: [PATCH 02/10] Add pine cones

---
 .../data/WamBlockLootTableProvider.java       |  11 +++-
 .../loot_tables/blocks/pine_leaves.json       |  55 ++++++++++++++++++
 .../juuxel/woodsandmires/item/WamItems.java   |   1 +
 .../assets/woods_and_mires/lang/en_us.json    |   1 +
 .../assets/woods_and_mires/lang/fi_fi.json    |   1 +
 .../models/item/pine_cone.json                |   6 ++
 .../textures/item/pine_cone.png               | Bin 0 -> 837 bytes
 .../resources/woods_and_mires.accesswidener   |   1 +
 8 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/woods_and_mires/models/item/pine_cone.json
 create mode 100644 src/main/resources/assets/woods_and_mires/textures/item/pine_cone.png

diff --git a/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java b/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
index 437ca9e..9afdbd4 100644
--- a/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
+++ b/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
@@ -1,6 +1,7 @@
 package juuxel.woodsandmires.data;
 
 import juuxel.woodsandmires.block.WamBlocks;
+import juuxel.woodsandmires.item.WamItems;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
 import net.minecraft.block.TallPlantBlock;
@@ -32,7 +33,15 @@ protected void generateBlockLootTables() {
         addDrop(WamBlocks.PINE_SIGN);
         addDrop(WamBlocks.PINE_DOOR, BlockLootTableGenerator::addDoorDrop);
         addDrop(WamBlocks.PINE_TRAPDOOR);
-        addDrop(WamBlocks.PINE_LEAVES, block -> leavesDrop(block, WamBlocks.PINE_SAPLING, SAPLING_DROP_CHANCE));
+        addDrop(WamBlocks.PINE_LEAVES,
+            block -> leavesDrop(block, WamBlocks.PINE_SAPLING, SAPLING_DROP_CHANCE)
+                .pool(addSurvivesExplosionCondition(WamItems.PINE_CONE, LootPool.builder()
+                    .conditionally(WITHOUT_SILK_TOUCH_NOR_SHEARS)
+                    .with(ItemEntry.builder(WamItems.PINE_CONE)
+                        .apply(SetCountLootFunction.builder(BinomialLootNumberProvider.create(3, 0.07f)))
+                    )
+                ))
+        );
         addDrop(WamBlocks.PINE_SAPLING);
         addPottedPlantDrop(WamBlocks.POTTED_PINE_SAPLING);
         addDrop(WamBlocks.PINE_WOOD);
diff --git a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
index cb47a9b..c7c1659 100644
--- a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
+++ b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
@@ -130,6 +130,61 @@
           }
         }
       ]
+    },
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:binomial",
+                "n": 3.0,
+                "p": 0.07
+              },
+              "add": false
+            }
+          ],
+          "name": "woods_and_mires:pine_cone"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:alternative",
+            "terms": [
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "items": [
+                    "minecraft:shears"
+                  ]
+                }
+              },
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "enchantments": [
+                    {
+                      "enchantment": "minecraft:silk_touch",
+                      "levels": {
+                        "min": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
     }
   ]
 }
diff --git a/src/main/java/juuxel/woodsandmires/item/WamItems.java b/src/main/java/juuxel/woodsandmires/item/WamItems.java
index eb7a2c0..81c9f9e 100644
--- a/src/main/java/juuxel/woodsandmires/item/WamItems.java
+++ b/src/main/java/juuxel/woodsandmires/item/WamItems.java
@@ -9,6 +9,7 @@
 
 public final class WamItems {
     public static final Item PINE_BOAT = register("pine_boat", new WamBoatItem(WamBoat.PINE, new Item.Settings().group(ItemGroup.TRANSPORTATION)));
+    public static final Item PINE_CONE = register("pine_cone", new Item(new Item.Settings().group(ItemGroup.MATERIALS)));
 
     public static void init() {
         for (WamBoat boat : WamBoat.values()) {
diff --git a/src/main/resources/assets/woods_and_mires/lang/en_us.json b/src/main/resources/assets/woods_and_mires/lang/en_us.json
index ff71631..6dabbda 100644
--- a/src/main/resources/assets/woods_and_mires/lang/en_us.json
+++ b/src/main/resources/assets/woods_and_mires/lang/en_us.json
@@ -39,6 +39,7 @@
   "block.woods_and_mires.tansy": "Tansy",
 
   "item.woods_and_mires.pine_boat": "Pine Boat",
+  "item.woods_and_mires.pine_cone": "Pine Cone",
 
   "entity.woods_and_mires.pine_boat": "Pine Boat",
 
diff --git a/src/main/resources/assets/woods_and_mires/lang/fi_fi.json b/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
index bd4c709..e703914 100644
--- a/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
+++ b/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
@@ -39,6 +39,7 @@
   "block.woods_and_mires.tansy": "Pietaryrtti",
 
   "item.woods_and_mires.pine_boat": "Mäntyvene",
+  "item.woods_and_mires.pine_cone": "Männynkäpy",
 
   "entity.woods_and_mires.pine_boat": "Mäntyvene",
 
diff --git a/src/main/resources/assets/woods_and_mires/models/item/pine_cone.json b/src/main/resources/assets/woods_and_mires/models/item/pine_cone.json
new file mode 100644
index 0000000..d63457e
--- /dev/null
+++ b/src/main/resources/assets/woods_and_mires/models/item/pine_cone.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "woods_and_mires:item/pine_cone"
+  }
+}
diff --git a/src/main/resources/assets/woods_and_mires/textures/item/pine_cone.png b/src/main/resources/assets/woods_and_mires/textures/item/pine_cone.png
new file mode 100644
index 0000000000000000000000000000000000000000..140f2e6570110064b8a8bffaa3e7d51326b9669c
GIT binary patch
literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7x6B6bjQ$WS|35EXHhDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_)x}BCMN0f%QfLw5!Ery{-Fw`<1B7Oksb<dvplX(p
zPQ=ArepL*-B7hJE5rto3rk>0!X5l%$?&0I>U5saWpZjwRC<T)NK9P8i>4rtTK|Hf*
z>74h8!>lYR#OK8023?T&k?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs$PqkJLf
zvch?bvs$gQ_C5Ivg9U9R!*!aYNMH#`q#!~@9TikzAx5i4iitGs$36Tbjz2{%nOqex
zax9<*6_Voz|AXJ%n#HL}Hz^ngdS7h&V+;uF0<DH^e;?a+>jdyW16NwdUuy!hpQJZB
zTI2`_Z37qA9ZlW?E_Z<8CtWfmNAlAYibdf4jJ_!k4BZ0#Yi@7teVjf3S?X%}1~@nb
zq9w{+_jq?-cW?imY4`U7S@&|Cs%{=g00006VoOIv00000008+zyMF)x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=LZiKF&Yj+Y}Nn(02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00A9IL_t(I%iWQ&O2beThQC`%p@U!tQ7BRBP;@8`T?<|8
zTe$ibjy`}7;qEFp1p-bIBtt@nND=}m4Kxtaz$Fj|xgl*y?Iw7pa}V7Ae0&G~x`b*T
z@1`X{oJpQu-o>E-ZPj>DLa<E9Wl@DaJnQ0Mg6Z{nIU5g%Gf9@N36?37k%nOfynedk
z*8qU~+nZ8R4Ew!`Xf__uM6@wb6aa=5Fd1pYnZ$7yXeUQpoE`6kwCWGt_JtQE7*;?o
z3%n@7bV71j0PyzlRr%SGsA?XrP%a#IL7hm+-W#CXz8Lm<l?!#9tIJaWOefqQuuY*p
zWa*lDxI(vm(I|0SXt&ee*xc>>?5m%()fAxHzQ|>P>4cb0SZ!89|51GdqoAMOw<zoa
P00000NkvXXu0mjf4{=$q

literal 0
HcmV?d00001

diff --git a/src/main/resources/woods_and_mires.accesswidener b/src/main/resources/woods_and_mires.accesswidener
index e283a63..88f297b 100644
--- a/src/main/resources/woods_and_mires.accesswidener
+++ b/src/main/resources/woods_and_mires.accesswidener
@@ -16,6 +16,7 @@ accessible method net/minecraft/world/gen/feature/VegetationConfiguredFeatures c
 
 # Data generation
 accessible field net/minecraft/data/server/BlockLootTableGenerator SAPLING_DROP_CHANCE [F
+accessible field net/minecraft/data/server/BlockLootTableGenerator WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/loot/condition/LootCondition$Builder;
 
 # Rendering
 accessible field net/minecraft/client/render/entity/BoatEntityRenderer texturesAndModels Ljava/util/Map;

From cf34a19c497267f21fe31bd9c0e0df447cbfbcfe Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 16 Jul 2023 02:26:29 +0300
Subject: [PATCH 03/10] Replace GenerationSettingsBuilderAccessor with an AW

I was wary of adding dev-only AWs, but WaM already has them :shrug:
---
 .../builtin/WamGenerationSettingsBuilder.java     |  5 +----
 .../mixin/GenerationSettingsBuilderAccessor.java  | 15 ---------------
 .../resources/mixins.woods_and_mires_data.json    |  1 -
 src/main/resources/woods_and_mires.accesswidener  |  1 +
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 src/data/java/juuxel/woodsandmires/data/mixin/GenerationSettingsBuilderAccessor.java

diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
index 96307ac..8723e1a 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
@@ -1,6 +1,5 @@
 package juuxel.woodsandmires.data.builtin;
 
-import juuxel.woodsandmires.data.mixin.GenerationSettingsBuilderAccessor;
 import net.minecraft.util.TopologicalSorts;
 import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.world.biome.GenerationSettings;
@@ -54,9 +53,7 @@ public GenerationSettings build() {
 
     private void order() {
         orderingsByStep.forEach((step, orderings) -> {
-            List<RegistryEntry<PlacedFeature>> features = ((GenerationSettingsBuilderAccessor) this)
-                .getFeatures()
-                .get(step.ordinal());
+            List<RegistryEntry<PlacedFeature>> features = this.features.get(step.ordinal());
 
             Set<RegistryEntry<PlacedFeature>> visited = new HashSet<>();
             Set<RegistryEntry<PlacedFeature>> visiting = new HashSet<>();
diff --git a/src/data/java/juuxel/woodsandmires/data/mixin/GenerationSettingsBuilderAccessor.java b/src/data/java/juuxel/woodsandmires/data/mixin/GenerationSettingsBuilderAccessor.java
deleted file mode 100644
index a5cec50..0000000
--- a/src/data/java/juuxel/woodsandmires/data/mixin/GenerationSettingsBuilderAccessor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package juuxel.woodsandmires.data.mixin;
-
-import net.minecraft.util.registry.RegistryEntry;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.feature.PlacedFeature;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-
-@Mixin(GenerationSettings.Builder.class)
-public interface GenerationSettingsBuilderAccessor {
-    @Accessor
-    List<List<RegistryEntry<PlacedFeature>>> getFeatures();
-}
diff --git a/src/data/resources/mixins.woods_and_mires_data.json b/src/data/resources/mixins.woods_and_mires_data.json
index e0cf934..994b5cc 100644
--- a/src/data/resources/mixins.woods_and_mires_data.json
+++ b/src/data/resources/mixins.woods_and_mires_data.json
@@ -5,7 +5,6 @@
   "mixins": [
     "AbstractTagProviderMixin",
     "DataProviderMixin",
-    "GenerationSettingsBuilderAccessor",
     "RecipeProviderMixin"
   ],
   "injectors": {
diff --git a/src/main/resources/woods_and_mires.accesswidener b/src/main/resources/woods_and_mires.accesswidener
index 88f297b..9c9e8af 100644
--- a/src/main/resources/woods_and_mires.accesswidener
+++ b/src/main/resources/woods_and_mires.accesswidener
@@ -17,6 +17,7 @@ accessible method net/minecraft/world/gen/feature/VegetationConfiguredFeatures c
 # Data generation
 accessible field net/minecraft/data/server/BlockLootTableGenerator SAPLING_DROP_CHANCE [F
 accessible field net/minecraft/data/server/BlockLootTableGenerator WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/loot/condition/LootCondition$Builder;
+accessible field net/minecraft/world/biome/GenerationSettings$Builder features Ljava/util/List;
 
 # Rendering
 accessible field net/minecraft/client/render/entity/BoatEntityRenderer texturesAndModels Ljava/util/Map;

From acb2d2bef24610fffaf50a77880c29ea64fd04b1 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 01:16:00 +0300
Subject: [PATCH 04/10] WamGenerationSettingsBuilder: Move "before" instead of
 "after"

Postponing causes more unwanted changes that lead to more cycles.
---
 .../data/builtin/WamGenerationSettingsBuilder.java        | 6 +++---
 .../woods_and_mires/worldgen/biome/lush_pine_forest.json  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
index 8723e1a..7da87a5 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
@@ -76,9 +76,9 @@ private void order() {
                     int afterIndex = features.indexOf(after);
                     if (beforeIndex <= afterIndex) continue;
 
-                    // Move "after" to be after the "before" entry
-                    features.add(beforeIndex + 1, after);
-                    features.remove(afterIndex);
+                    // Move "before" to be before the "after" entry
+                    features.remove(beforeIndex);
+                    features.add(afterIndex, before);
                 }
             }
         });
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
index dac89ca..d08bfaf 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
@@ -72,16 +72,16 @@
     ],
     [
       "minecraft:glow_lichen",
-      "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
       "minecraft:patch_tall_grass",
       "minecraft:forest_flowers",
+      "minecraft:patch_large_fern",
+      "woods_and_mires:fallen_pine",
       "woods_and_mires:lush_pine_forest_trees",
       "woods_and_mires:lush_pine_forest_flowers",
-      "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
       "minecraft:patch_grass_forest",
       "minecraft:flower_warm",
+      "minecraft:flower_default",
+      "woods_and_mires:pine_forest_heather_patch",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",

From 6c7176427549ca0acb69d585cec5013c21dc4ed1 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:13:54 +0300
Subject: [PATCH 05/10] Automatically solve feature order cycles with the power
 of graph theory

...in other words, use JGraphT to prevent FOCs by creating a DAG of
all features, adding preexisting order constraints and combining that with
  a. the manual ordering between features for mod compat
  b. the ordering present in a registered mod biome.
This also removes my custom sorting impl from WamGenerationSettingsBuilder.
---
 build.gradle                                  |  2 +
 gradle.properties                             |  1 +
 .../woodsandmires/data/builtin/WamBiomes.java | 50 ++++++++++++---
 .../builtin/WamGenerationSettingsBuilder.java | 61 ++++++++++---------
 .../woods_and_mires/worldgen/biome/fell.json  |  2 +-
 .../worldgen/biome/lush_pine_forest.json      | 14 ++---
 .../biome/old_growth_pine_forest.json         |  8 +--
 .../worldgen/biome/pine_forest.json           |  8 +--
 .../worldgen/biome/pine_mire.json             |  2 +-
 .../worldgen/biome/piny_grove.json            |  4 +-
 .../worldgen/biome/snowy_pine_forest.json     |  6 +-
 11 files changed, 98 insertions(+), 60 deletions(-)

diff --git a/build.gradle b/build.gradle
index 53c20c4..dd0bbe6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,6 +73,8 @@ dependencies {
     modImplementation include("com.terraformersmc.terraform-api:terraform-wood-api-v1:$project.terraform_version")
 
     dataImplementation sourceSets.main.output
+    // Used for sorting features in the data generator
+    dataImplementation "org.jgrapht:jgrapht-core:$project.jgrapht_version"
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
index 9a4eeb8..1537ae4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,3 +17,4 @@ fabric_version = 0.76.0+1.18.2
 terrablender_version = 1.18.2-1.2.0.126
 typesafe_config_version = 1.4.2
 terraform_version = 3.1.0
+jgrapht_version = 1.5.2
diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
index 150b1ec..05abfd2 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
@@ -14,17 +14,24 @@
 import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
+import net.minecraft.world.gen.feature.PlacedFeature;
 import net.minecraft.world.gen.feature.VegetationPlacedFeatures;
+import org.jgrapht.graph.DefaultEdge;
+import org.jgrapht.graph.DirectedAcyclicGraph;
+import org.jgrapht.graph.GraphCycleProhibitedException;
 
 import java.util.function.Consumer;
 
 public final class WamBiomes {
     public static final RegistryCollector<RegistryEntry<Biome>> BIOMES = new RegistryCollector<>();
+    private static final DirectedAcyclicGraph<RegistryEntry<PlacedFeature>, DefaultEdge> FEATURE_GRAPH =
+        new DirectedAcyclicGraph<>(DefaultEdge.class);
 
     private WamBiomes() {
     }
 
     public static void register() {
+        initGraph();
         register(WamBiomeKeys.PINE_FOREST, pineForest());
         register(WamBiomeKeys.SNOWY_PINE_FOREST, snowyPineForest());
         register(WamBiomeKeys.OLD_GROWTH_PINE_FOREST, oldGrowthPineForest());
@@ -35,8 +42,42 @@ public static void register() {
         register(WamBiomeKeys.PINY_GROVE, pinyGrove());
     }
 
+    private static void initGraph() {
+        for (var biome : BuiltinRegistries.BIOME) {
+            addBiomeToGraph(biome);
+        }
+    }
+
+    private static void addBiomeToGraph(Biome biome) {
+        for (var features : biome.getGenerationSettings().getFeatures()) {
+            if (features.size() == 0) continue;
+
+            var before = features.get(0);
+            FEATURE_GRAPH.addVertex(before);
+
+            for (int i = 1; i < features.size(); i++) {
+                var after = features.get(i);
+                FEATURE_GRAPH.addVertex(after);
+
+                try {
+                    FEATURE_GRAPH.addEdge(before, after);
+                } catch (GraphCycleProhibitedException e) {
+                    throw new IllegalStateException("Feature order cycle found between " + before.getKey() + " and " + after.getKey(), e);
+                }
+
+                before = after;
+            }
+        }
+    }
+
     private static void register(RegistryKey<Biome> key, Biome biome) {
         BIOMES.add(BuiltinRegistries.add(BuiltinRegistries.BIOME, key, biome));
+
+        try {
+            addBiomeToGraph(biome);
+        } catch (Exception e) {
+            throw new IllegalStateException(e.getMessage() + " [biome=" + key.getValue() + "]", e);
+        }
     }
 
     private static int getSkyColor(float temperature) {
@@ -123,13 +164,6 @@ private static Biome lushPineForest() {
             builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, WamPlacedFeatures.LUSH_PINE_FOREST_FLOWERS);
             DefaultBiomeFeatures.addExtraDefaultFlowers(builder);
 
-            // Required to keep vanilla order for savanna tall grass
-            builder.addOrdering(
-                GenerationStep.Feature.VEGETAL_DECORATION,
-                VegetationPlacedFeatures.PATCH_TALL_GRASS,
-                VegetationPlacedFeatures.FOREST_FLOWERS
-            );
-
             // https://github.com/Juuxel/WoodsAndMires/issues/14
             builder.addOrdering(
                 GenerationStep.Feature.VEGETAL_DECORATION,
@@ -274,7 +308,7 @@ private static Biome pinyGrove() {
     private static GenerationSettings generationSettings(Consumer<? super WamGenerationSettingsBuilder> configurator) {
         WamGenerationSettingsBuilder builder = new WamGenerationSettingsBuilder();
         configurator.accept(builder);
-        return builder.build();
+        return builder.build(FEATURE_GRAPH);
     }
 
     private static SpawnSettings spawnSettings(Consumer<SpawnSettings.Builder> configurator) {
diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
index 7da87a5..10b5953 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamGenerationSettingsBuilder.java
@@ -1,19 +1,21 @@
 package juuxel.woodsandmires.data.builtin;
 
-import net.minecraft.util.TopologicalSorts;
 import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.world.biome.GenerationSettings;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.carver.ConfiguredCarver;
 import net.minecraft.world.gen.feature.PlacedFeature;
+import org.jgrapht.Graphs;
+import org.jgrapht.graph.DefaultEdge;
+import org.jgrapht.graph.DirectedAcyclicGraph;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 
 public class WamGenerationSettingsBuilder extends GenerationSettings.Builder {
     // step -> before -> [after]
@@ -45,42 +47,41 @@ public WamGenerationSettingsBuilder addOrdering(GenerationStep.Feature step, Reg
         return this;
     }
 
+    @Deprecated
     @Override
     public GenerationSettings build() {
-        order();
+        throw new UnsupportedOperationException("Use build(DirectedAcyclicGraph) instead");
+    }
+
+    public GenerationSettings build(DirectedAcyclicGraph<RegistryEntry<PlacedFeature>, DefaultEdge> globalGraph) {
+        order(globalGraph);
         return super.build();
     }
 
-    private void order() {
-        orderingsByStep.forEach((step, orderings) -> {
-            List<RegistryEntry<PlacedFeature>> features = this.features.get(step.ordinal());
+    private void order(DirectedAcyclicGraph<RegistryEntry<PlacedFeature>, DefaultEdge> globalGraph) {
+        var steps = GenerationStep.Feature.values();
+        for (int i = 0; i < this.features.size(); i++) {
+            var features = this.features.get(i);
+            var localGraph = new DirectedAcyclicGraph<RegistryEntry<PlacedFeature>, DefaultEdge>(DefaultEdge.class);
+            Graphs.addGraph(localGraph, globalGraph);
 
-            Set<RegistryEntry<PlacedFeature>> visited = new HashSet<>();
-            Set<RegistryEntry<PlacedFeature>> visiting = new HashSet<>();
-            Consumer<RegistryEntry<PlacedFeature>> noopConsumer = x -> {};
+            for (var feature : features) {
+                localGraph.addVertex(feature);
+            }
 
-            // Iterate over all constraints
-            for (var before : orderings.keySet()) {
-                // Check that the ordering is consistent
-                if (TopologicalSorts.sort(orderings, visited, visiting, noopConsumer, before)) {
-                    throw new IllegalStateException("Found inconsistent order in step " + step + "; cycle starting from " + before);
+            var step = steps[i];
+            orderingsByStep.getOrDefault(step, Map.of()).forEach((before, allAfter) -> {
+                for (var after : allAfter) {
+                    localGraph.addEdge(before, after);
                 }
-                visited.clear();
-                visiting.clear();
+            });
 
-                // Add the order
-                // Note: we won't use the mc toposort here since we want to keep the general order.
-                // It's still useful for checking for cycles.
-                for (var after : orderings.get(before)) {
-                    int beforeIndex = features.indexOf(before);
-                    int afterIndex = features.indexOf(after);
-                    if (beforeIndex <= afterIndex) continue;
-
-                    // Move "before" to be before the "after" entry
-                    features.remove(beforeIndex);
-                    features.add(afterIndex, before);
-                }
+            var orderProvider = new ArrayList<RegistryEntry<PlacedFeature>>(localGraph.vertexSet().size());
+            for (var feature : localGraph) {
+                orderProvider.add(feature);
             }
-        });
+
+            features.sort(Comparator.comparingInt(orderProvider::indexOf));
+        }
     }
 }
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/fell.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/fell.json
index f3f905f..f311324 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/fell.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/fell.json
@@ -73,12 +73,12 @@
     [
       "minecraft:glow_lichen",
       "minecraft:flower_default",
-      "woods_and_mires:fell_heather_patch",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
+      "woods_and_mires:fell_heather_patch",
       "woods_and_mires:fell_lichen",
       "woods_and_mires:fell_moss_patch",
       "woods_and_mires:fell_vegetation",
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
index d08bfaf..6061c3f 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
@@ -72,21 +72,21 @@
     ],
     [
       "minecraft:glow_lichen",
-      "minecraft:patch_tall_grass",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
-      "woods_and_mires:lush_pine_forest_trees",
-      "woods_and_mires:lush_pine_forest_flowers",
+      "minecraft:flower_default",
       "minecraft:patch_grass_forest",
+      "minecraft:patch_tall_grass",
       "minecraft:flower_warm",
-      "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:pine_forest_heather_patch",
+      "woods_and_mires:lush_pine_forest_trees",
+      "woods_and_mires:lush_pine_forest_flowers"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
index a8ac00f..b546c6f 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
@@ -74,16 +74,16 @@
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
-      "woods_and_mires:old_growth_pine_forest_trees",
       "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:pine_forest_heather_patch",
+      "woods_and_mires:old_growth_pine_forest_trees"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
index 149c960..085ce9b 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
@@ -74,16 +74,16 @@
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
-      "woods_and_mires:forest_pine",
       "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:forest_pine",
+      "woods_and_mires:pine_forest_heather_patch"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_mire.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_mire.json
index 302fee9..18c0344 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_mire.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_mire.json
@@ -54,9 +54,9 @@
     ],
     [
       "minecraft:glow_lichen",
+      "minecraft:patch_waterlily",
       "woods_and_mires:mire_pine_shrub",
       "woods_and_mires:mire_flowers",
-      "minecraft:patch_waterlily",
       "woods_and_mires:mire_pine_snag"
     ],
     [
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/piny_grove.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/piny_grove.json
index 8739928..63f6357 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/piny_grove.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/piny_grove.json
@@ -74,9 +74,9 @@
     ],
     [
       "minecraft:glow_lichen",
-      "woods_and_mires:piny_grove_trees",
       "minecraft:patch_sugar_cane",
-      "minecraft:patch_pumpkin"
+      "minecraft:patch_pumpkin",
+      "woods_and_mires:piny_grove_trees"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/snowy_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/snowy_pine_forest.json
index abba96c..9123384 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/snowy_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/snowy_pine_forest.json
@@ -74,14 +74,14 @@
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
-      "woods_and_mires:snowy_pine_forest_trees",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:snowy_pine_forest_trees"
     ],
     [
       "minecraft:freeze_top_layer"

From 32785974dc3b51a12f1717d6c4f2600660c05457 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:34:38 +0300
Subject: [PATCH 06/10] Improve pine cone texture

---
 .../textures/item/pine_cone.png                | Bin 837 -> 5685 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/woods_and_mires/textures/item/pine_cone.png b/src/main/resources/assets/woods_and_mires/textures/item/pine_cone.png
index 140f2e6570110064b8a8bffaa3e7d51326b9669c..38bf50eead501fc923c461567b5a7378691dbee6 100644
GIT binary patch
literal 5685
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

delta 752
zcmV<M0uTMQEX4+pBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ>7x6B6bjQ
z$WS|35EXHhDi*;)X)CnqU~=gfG-*guTpR`0f`cE6RR<SmT^(EnLGS~_)x}BCMN0f%
zQfLw5!Ery{-Fw`<1B7Oksb<dvplX(pPQ=ArepL*-B7hJE5r2hWVy2$VEN0<3zV6}U
z>s^dzd7t}p3@8PY0X~s<j_HO)yg@v(Y3ZEziNmZcDa7Z*;|5)j_>t?f%Ws@Z4huXp
zY-H2(#9?Bw)Wvcav$CNQPZLKJRik_%=d!|ii?dp-v-Umt3xfr1CBt=^qex&0Nu(e`
zMjaJYVIfAVMt_QlH0{Sd{3DJ(MJ}0K6)<uvpavC^;|KqP-`$$UsYy2}7zcV^Z2Myj
z2<!r_hHZZz+ji>&@IM1rTE|~&0<)i_H#%D62ncNh7uOw4-UBXofZ-=yG9*Xx(-ewD
z;QfrgDGv<Y0{v@lZ|!}YJ^)$jYWW5@I0T|4%3k+)cOzeSZ~vZY_xA%?_i~-8ZXQSg
z000JJOGiWi000000Qp0^f0JbtAP5f@F&Yj+Y}S*F6exckNkl<ZILqCUu}Z^G6o$WB
zN}+>b2T>?d>QHnj4qXdf>|40{7LGoE58>`AI0XVu5+p-Hhe#3vDGf9b(!eDU2e~0_
zN$n<hrgIP6|9pH0{<?%}9`B|lK%7aQUf#u_0d3WIQ9`gx$z@T6Jv{5;V1nuOc{v*o
zh%-r+t_gpZDU*?gVFkQ?y5iRWfcx8<Qc(>1y^3fy9?(RzF;El$h7~XwX~dbtaTjPO
zM_im8?}W7K58d{K7bO^0KrRcsD8Y0>a#;ZI_VHEu*^#Jf9<ER>9CtyTNXgzCpxeF}
z_Is5Jb)BorQvggS+#j$_p+02knt8ZFw|&tlaa%NKx6|I(-0l4AtDm*i6rkI_$Yp`)
igqTiPZB|16QGElWpr78iDC`0N0000<MNUMnLSTX>rb<=-


From 9464bfad30d5dc6164872f53e7bc3212301ea3e8 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 15:11:58 +0300
Subject: [PATCH 07/10] Fix tree decorators modifying the ground

- Fixes pine trees extending underground
- Fixes dirt growing branches in mires
---
 .../juuxel/woodsandmires/tree/AgedTrunkTreeDecorator.java     | 4 ++++
 .../java/juuxel/woodsandmires/tree/BranchTreeDecorator.java   | 3 +++
 .../juuxel/woodsandmires/tree/ReplaceTrunkTreeDecorator.java  | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/main/java/juuxel/woodsandmires/tree/AgedTrunkTreeDecorator.java b/src/main/java/juuxel/woodsandmires/tree/AgedTrunkTreeDecorator.java
index 97277b2..6cab856 100644
--- a/src/main/java/juuxel/woodsandmires/tree/AgedTrunkTreeDecorator.java
+++ b/src/main/java/juuxel/woodsandmires/tree/AgedTrunkTreeDecorator.java
@@ -12,6 +12,7 @@
 import net.minecraft.util.math.floatprovider.FloatProvider;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.TestableWorld;
+import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.treedecorator.TreeDecorator;
 import net.minecraft.world.gen.treedecorator.TreeDecoratorType;
 
@@ -65,6 +66,9 @@ public void generate(TestableWorld world, BiConsumer<BlockPos, BlockState> repla
         for (BlockPos pos : sortedLogPositions) {
             if (pos.getY() > midY) {
                 break;
+            } else if (world.testBlockState(pos, Feature::isSoil)) {
+                // Don't replace the dirt underneath the trunk
+                continue;
             }
 
             BlockState state = log.getDefaultState().with(AgedLogBlock.MID, pos.getY() == midY);
diff --git a/src/main/java/juuxel/woodsandmires/tree/BranchTreeDecorator.java b/src/main/java/juuxel/woodsandmires/tree/BranchTreeDecorator.java
index c221b3b..93b09db 100644
--- a/src/main/java/juuxel/woodsandmires/tree/BranchTreeDecorator.java
+++ b/src/main/java/juuxel/woodsandmires/tree/BranchTreeDecorator.java
@@ -51,6 +51,9 @@ public void generate(TestableWorld world, BiConsumer<BlockPos, BlockState> repla
         BlockPos.Mutable mut = new BlockPos.Mutable();
 
         for (BlockPos pos : logPositions) {
+            // Don't replace the dirt underneath the trunk
+            if (world.testBlockState(pos, Feature::isSoil)) continue;
+
             mut.set(pos);
 
             for (Direction side : Direction.Type.HORIZONTAL) {
diff --git a/src/main/java/juuxel/woodsandmires/tree/ReplaceTrunkTreeDecorator.java b/src/main/java/juuxel/woodsandmires/tree/ReplaceTrunkTreeDecorator.java
index 259dce3..ffd9423 100644
--- a/src/main/java/juuxel/woodsandmires/tree/ReplaceTrunkTreeDecorator.java
+++ b/src/main/java/juuxel/woodsandmires/tree/ReplaceTrunkTreeDecorator.java
@@ -5,6 +5,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.TestableWorld;
+import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.stateprovider.BlockStateProvider;
 import net.minecraft.world.gen.treedecorator.TreeDecorator;
 import net.minecraft.world.gen.treedecorator.TreeDecoratorType;
@@ -38,6 +39,9 @@ protected TreeDecoratorType<?> getType() {
     @Override
     public void generate(TestableWorld world, BiConsumer<BlockPos, BlockState> replacer, Random random, List<BlockPos> logPositions, List<BlockPos> leavesPositions) {
         for (BlockPos pos : logPositions) {
+            // Don't replace the dirt underneath the trunk
+            if (world.testBlockState(pos, Feature::isSoil)) continue;
+
             replacer.accept(pos, trunk.getBlockState(random, pos));
         }
     }

From bf92005934b4a1477f0eccf9cf122b41e7517e1a Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 15:12:15 +0300
Subject: [PATCH 08/10] Decrease pine cone drop rate

---
 .../juuxel/woodsandmires/data/WamBlockLootTableProvider.java    | 2 +-
 .../data/woods_and_mires/loot_tables/blocks/pine_leaves.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java b/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
index 9afdbd4..50546c1 100644
--- a/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
+++ b/src/data/java/juuxel/woodsandmires/data/WamBlockLootTableProvider.java
@@ -38,7 +38,7 @@ protected void generateBlockLootTables() {
                 .pool(addSurvivesExplosionCondition(WamItems.PINE_CONE, LootPool.builder()
                     .conditionally(WITHOUT_SILK_TOUCH_NOR_SHEARS)
                     .with(ItemEntry.builder(WamItems.PINE_CONE)
-                        .apply(SetCountLootFunction.builder(BinomialLootNumberProvider.create(3, 0.07f)))
+                        .apply(SetCountLootFunction.builder(BinomialLootNumberProvider.create(3, 0.04f)))
                     )
                 ))
         );
diff --git a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
index c7c1659..d564f7c 100644
--- a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
+++ b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
@@ -143,7 +143,7 @@
               "count": {
                 "type": "minecraft:binomial",
                 "n": 3.0,
-                "p": 0.07
+                "p": 0.04
               },
               "add": false
             }

From 6b64b66d78708db48fa2bc16a7dd1f24e89d1de4 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 15:52:10 +0300
Subject: [PATCH 09/10] Add pine cone jam

---
 .../data/WamItemTagProvider.java              |   8 +++++
 .../woodsandmires/data/WamRecipeProvider.java |  10 ++++++
 .../data/builtin/CommonItemTags.java          |   4 +++
 .../resources/data/c/tags/items/honey.json    |   6 ++++
 .../resources/data/c/tags/items/jams.json     |   6 ++++
 .../data/c/tags/items/pine_cones.json         |   6 ++++
 .../resources/data/c/tags/items/sugar.json    |   6 ++++
 .../recipes/food/pine_cone_jam.json           |  34 ++++++++++++++++++
 .../recipes/pine_cone_jam.json                |  20 +++++++++++
 .../juuxel/woodsandmires/item/WamItems.java   |   8 +++++
 .../assets/woods_and_mires/lang/en_us.json    |   5 +++
 .../assets/woods_and_mires/lang/fi_fi.json    |   5 +++
 .../models/item/pine_cone_jam.json            |   6 ++++
 .../textures/item/pine_cone_jam.png           | Bin 0 -> 5506 bytes
 unused_assets/jar.png                         | Bin 0 -> 5270 bytes
 15 files changed, 124 insertions(+)
 create mode 100644 src/generated/resources/data/c/tags/items/honey.json
 create mode 100644 src/generated/resources/data/c/tags/items/jams.json
 create mode 100644 src/generated/resources/data/c/tags/items/pine_cones.json
 create mode 100644 src/generated/resources/data/c/tags/items/sugar.json
 create mode 100644 src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
 create mode 100644 src/generated/resources/data/woods_and_mires/recipes/pine_cone_jam.json
 create mode 100644 src/main/resources/assets/woods_and_mires/models/item/pine_cone_jam.json
 create mode 100644 src/main/resources/assets/woods_and_mires/textures/item/pine_cone_jam.png
 create mode 100644 unused_assets/jar.png

diff --git a/src/data/java/juuxel/woodsandmires/data/WamItemTagProvider.java b/src/data/java/juuxel/woodsandmires/data/WamItemTagProvider.java
index 5560aa0..1b43eec 100644
--- a/src/data/java/juuxel/woodsandmires/data/WamItemTagProvider.java
+++ b/src/data/java/juuxel/woodsandmires/data/WamItemTagProvider.java
@@ -62,6 +62,14 @@ protected void generateTags() {
             .add(WamBlocks.PINE_SNAG_LOG, WamBlocks.PINE_SNAG_WOOD);
 
         // Common tags
+        builder(CommonItemTags.HONEY)
+            .add(WamItems.PINE_CONE_JAM);
+        builder(CommonItemTags.JAMS)
+            .add(WamItems.PINE_CONE_JAM);
+        builder(CommonItemTags.PINE_CONES)
+            .add(WamItems.PINE_CONE);
+        builder(CommonItemTags.SUGAR)
+            .add(Items.SUGAR);
         builder(CommonItemTags.WOODEN_RODS)
             .add(Items.STICK);
     }
diff --git a/src/data/java/juuxel/woodsandmires/data/WamRecipeProvider.java b/src/data/java/juuxel/woodsandmires/data/WamRecipeProvider.java
index 93b27f5..4740c03 100644
--- a/src/data/java/juuxel/woodsandmires/data/WamRecipeProvider.java
+++ b/src/data/java/juuxel/woodsandmires/data/WamRecipeProvider.java
@@ -2,6 +2,7 @@
 
 import juuxel.woodsandmires.WoodsAndMires;
 import juuxel.woodsandmires.block.WamBlocks;
+import juuxel.woodsandmires.data.builtin.CommonItemTags;
 import juuxel.woodsandmires.item.WamItemTags;
 import juuxel.woodsandmires.item.WamItems;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
@@ -12,6 +13,7 @@
 import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.Items;
+import net.minecraft.recipe.Ingredient;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
@@ -55,6 +57,14 @@ protected void generateRecipes(Consumer<RecipeJsonProvider> exporter) {
         offerShapelessRecipe(exporter, Items.MAGENTA_DYE, WamBlocks.FIREWEED, "magenta_dye", 2);
         offerShapelessRecipe(exporter, Items.PINK_DYE, WamBlocks.HEATHER, "pink_dye", 1);
         offerShapelessRecipe(exporter, Items.YELLOW_DYE, WamBlocks.TANSY, "yellow_dye", 1);
+
+        // Other
+        ShapelessRecipeJsonBuilder.create(WamItems.PINE_CONE_JAM)
+            .input(Items.GLASS_BOTTLE)
+            .input(Ingredient.fromTag(CommonItemTags.PINE_CONES), 2)
+            .input(CommonItemTags.SUGAR)
+            .criterion(hasItem(WamItems.PINE_CONE), conditionsFromItem(WamItems.PINE_CONE))
+            .offerTo(exporter);
     }
 
     public static void offerShapelessRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input, @Nullable String group, int outputCount) {
diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/CommonItemTags.java b/src/data/java/juuxel/woodsandmires/data/builtin/CommonItemTags.java
index dc00197..a002f3d 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/CommonItemTags.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/CommonItemTags.java
@@ -6,6 +6,10 @@
 import net.minecraft.util.registry.Registry;
 
 public final class CommonItemTags {
+    public static final TagKey<Item> HONEY = of("honey");
+    public static final TagKey<Item> JAMS = of("jams");
+    public static final TagKey<Item> PINE_CONES = of("pine_cones");
+    public static final TagKey<Item> SUGAR = of("sugar");
     public static final TagKey<Item> WOODEN_RODS = of("wooden_rods");
 
     private static TagKey<Item> of(String path) {
diff --git a/src/generated/resources/data/c/tags/items/honey.json b/src/generated/resources/data/c/tags/items/honey.json
new file mode 100644
index 0000000..78800ce
--- /dev/null
+++ b/src/generated/resources/data/c/tags/items/honey.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "woods_and_mires:pine_cone_jam"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/items/jams.json b/src/generated/resources/data/c/tags/items/jams.json
new file mode 100644
index 0000000..78800ce
--- /dev/null
+++ b/src/generated/resources/data/c/tags/items/jams.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "woods_and_mires:pine_cone_jam"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/items/pine_cones.json b/src/generated/resources/data/c/tags/items/pine_cones.json
new file mode 100644
index 0000000..d224bb8
--- /dev/null
+++ b/src/generated/resources/data/c/tags/items/pine_cones.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "woods_and_mires:pine_cone"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/items/sugar.json b/src/generated/resources/data/c/tags/items/sugar.json
new file mode 100644
index 0000000..bc87462
--- /dev/null
+++ b/src/generated/resources/data/c/tags/items/sugar.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:sugar"
+  ]
+}
diff --git a/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json b/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
new file mode 100644
index 0000000..4235ba0
--- /dev/null
+++ b/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "woods_and_mires:pine_cone_jam"
+    ]
+  },
+  "criteria": {
+    "has_pine_cone": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "woods_and_mires:pine_cone"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "woods_and_mires:pine_cone_jam"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_pine_cone",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/src/generated/resources/data/woods_and_mires/recipes/pine_cone_jam.json b/src/generated/resources/data/woods_and_mires/recipes/pine_cone_jam.json
new file mode 100644
index 0000000..01e6ef4
--- /dev/null
+++ b/src/generated/resources/data/woods_and_mires/recipes/pine_cone_jam.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:glass_bottle"
+    },
+    {
+      "tag": "c:pine_cones"
+    },
+    {
+      "tag": "c:pine_cones"
+    },
+    {
+      "tag": "c:sugar"
+    }
+  ],
+  "result": {
+    "item": "woods_and_mires:pine_cone_jam"
+  }
+}
diff --git a/src/main/java/juuxel/woodsandmires/item/WamItems.java b/src/main/java/juuxel/woodsandmires/item/WamItems.java
index 81c9f9e..5fc2037 100644
--- a/src/main/java/juuxel/woodsandmires/item/WamItems.java
+++ b/src/main/java/juuxel/woodsandmires/item/WamItems.java
@@ -3,13 +3,21 @@
 import juuxel.woodsandmires.WoodsAndMires;
 import juuxel.woodsandmires.entity.WamBoat;
 import net.minecraft.block.DispenserBlock;
+import net.minecraft.item.FoodComponent;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.Items;
 import net.minecraft.util.registry.Registry;
 
 public final class WamItems {
     public static final Item PINE_BOAT = register("pine_boat", new WamBoatItem(WamBoat.PINE, new Item.Settings().group(ItemGroup.TRANSPORTATION)));
     public static final Item PINE_CONE = register("pine_cone", new Item(new Item.Settings().group(ItemGroup.MATERIALS)));
+    public static final Item PINE_CONE_JAM = register("pine_cone_jam", new Item(
+        new Item.Settings()
+            .group(ItemGroup.FOOD)
+            .recipeRemainder(Items.GLASS_BOTTLE)
+            .food(new FoodComponent.Builder().hunger(3).saturationModifier(0.25f).build())
+    ));
 
     public static void init() {
         for (WamBoat boat : WamBoat.values()) {
diff --git a/src/main/resources/assets/woods_and_mires/lang/en_us.json b/src/main/resources/assets/woods_and_mires/lang/en_us.json
index 6dabbda..849b3fe 100644
--- a/src/main/resources/assets/woods_and_mires/lang/en_us.json
+++ b/src/main/resources/assets/woods_and_mires/lang/en_us.json
@@ -40,9 +40,14 @@
 
   "item.woods_and_mires.pine_boat": "Pine Boat",
   "item.woods_and_mires.pine_cone": "Pine Cone",
+  "item.woods_and_mires.pine_cone_jam": "Pine Cone Jam",
 
   "entity.woods_and_mires.pine_boat": "Pine Boat",
 
+  "tag.item.c.honey": "Honey",
+  "tag.item.c.jams": "Jams",
+  "tag.item.c.pine_cones": "Pine Cones",
+  "tag.item.c.sugar": "Sugar",
   "tag.item.c.wooden_rods": "Wooden Rods",
   "tag.item.woods_and_mires.pine_logs": "Pine Logs",
   "tag.item.woods_and_mires.thick_pine_logs": "Thick Pine Logs"
diff --git a/src/main/resources/assets/woods_and_mires/lang/fi_fi.json b/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
index e703914..9c0439b 100644
--- a/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
+++ b/src/main/resources/assets/woods_and_mires/lang/fi_fi.json
@@ -40,9 +40,14 @@
 
   "item.woods_and_mires.pine_boat": "Mäntyvene",
   "item.woods_and_mires.pine_cone": "Männynkäpy",
+  "item.woods_and_mires.pine_cone_jam": "Männynkäpyhillo",
 
   "entity.woods_and_mires.pine_boat": "Mäntyvene",
 
+  "tag.item.c.honey": "Hunaja",
+  "tag.item.c.jams": "Hillot",
+  "tag.item.c.pine_cones": "Männynkävyt",
+  "tag.item.c.sugar": "Sokeri",
   "tag.item.c.wooden_rods": "Puusauvat",
   "tag.item.woods_and_mires.pine_logs": "Mäntyhalot",
   "tag.item.woods_and_mires.thick_pine_logs": "Paksut mäntyhalot"
diff --git a/src/main/resources/assets/woods_and_mires/models/item/pine_cone_jam.json b/src/main/resources/assets/woods_and_mires/models/item/pine_cone_jam.json
new file mode 100644
index 0000000..9baa15c
--- /dev/null
+++ b/src/main/resources/assets/woods_and_mires/models/item/pine_cone_jam.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "woods_and_mires:item/pine_cone_jam"
+  }
+}
diff --git a/src/main/resources/assets/woods_and_mires/textures/item/pine_cone_jam.png b/src/main/resources/assets/woods_and_mires/textures/item/pine_cone_jam.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a6ba8d0538353efdf17cede14b3bb3f32467863
GIT binary patch
literal 5506
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
J6Sl!y{sWDyYpnnP

literal 0
HcmV?d00001

diff --git a/unused_assets/jar.png b/unused_assets/jar.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c41a5be9ce6e72625498792c3fc6fe440d822f0
GIT binary patch
literal 5270
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
Q5Ie!&X953^cl7%I0J?(cdjJ3c

literal 0
HcmV?d00001


From 93cbc4a6b3d9bf87aec9f689b4e1dc9fb8cfb5d1 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 21 Jul 2023 16:09:21 +0300
Subject: [PATCH 10/10] Regenerate data

---
 .../recipes/food/pine_cone_jam.json           | 20 +++----
 .../loot_tables/blocks/pine_leaves.json       | 55 +++++++++++++++++++
 .../worldgen/biome/lush_pine_forest.json      | 14 ++---
 .../biome/old_growth_pine_forest.json         |  8 +--
 .../worldgen/biome/pine_forest.json           |  8 +--
 5 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json b/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
index 4235ba0..b951ffb 100644
--- a/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
+++ b/src/generated/resources/data/woods_and_mires/advancements/recipes/food/pine_cone_jam.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "woods_and_mires:pine_cone_jam"
-    ]
-  },
   "criteria": {
     "has_pine_cone": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,13 +10,14 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "woods_and_mires:pine_cone_jam"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
@@ -30,5 +25,10 @@
       "has_pine_cone",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "woods_and_mires:pine_cone_jam"
+    ]
+  }
 }
diff --git a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
index 865b9dc..a119c54 100644
--- a/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
+++ b/src/generated/resources/data/woods_and_mires/loot_tables/blocks/pine_leaves.json
@@ -130,6 +130,61 @@
         }
       ],
       "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:alternative",
+            "terms": [
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "items": [
+                    "minecraft:shears"
+                  ]
+                }
+              },
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "enchantments": [
+                    {
+                      "enchantment": "minecraft:silk_touch",
+                      "levels": {
+                        "min": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:binomial",
+                "n": 3.0,
+                "p": 0.04
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "woods_and_mires:pine_cone"
+        }
+      ],
+      "rolls": 1.0
     }
   ]
 }
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
index deec0ac..45979d4 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json
@@ -73,21 +73,21 @@
     ],
     [
       "minecraft:glow_lichen",
+      "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
       "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
-      "minecraft:patch_tall_grass",
-      "minecraft:forest_flowers",
-      "woods_and_mires:lush_pine_forest_trees",
-      "woods_and_mires:lush_pine_forest_flowers",
       "minecraft:patch_grass_forest",
+      "minecraft:patch_tall_grass",
       "minecraft:flower_warm",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:pine_forest_heather_patch",
+      "woods_and_mires:lush_pine_forest_trees",
+      "woods_and_mires:lush_pine_forest_flowers"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
index 13da085..50c34d8 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json
@@ -75,16 +75,16 @@
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
       "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
-      "woods_and_mires:old_growth_pine_forest_trees",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:pine_forest_heather_patch",
+      "woods_and_mires:old_growth_pine_forest_trees"
     ],
     [
       "minecraft:freeze_top_layer"
diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
index ee2fcb7..ac9d35c 100644
--- a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
+++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json
@@ -75,16 +75,16 @@
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
       "minecraft:patch_large_fern",
-      "woods_and_mires:fallen_pine",
       "minecraft:flower_default",
-      "woods_and_mires:pine_forest_heather_patch",
-      "woods_and_mires:forest_pine",
       "minecraft:patch_grass_forest",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",
       "minecraft:patch_sugar_cane",
       "minecraft:patch_pumpkin",
-      "minecraft:patch_berry_common"
+      "minecraft:patch_berry_common",
+      "woods_and_mires:fallen_pine",
+      "woods_and_mires:pine_forest_heather_patch",
+      "woods_and_mires:forest_pine"
     ],
     [
       "minecraft:freeze_top_layer"