From 9492973a2802b9e74dd4eff4069f45fa9ca21b25 Mon Sep 17 00:00:00 2001
From: Flanks255 <32142731+Flanks255@users.noreply.github.com>
Date: Sun, 17 Nov 2024 13:58:23 -0600
Subject: [PATCH] Tweaked a coal generator fuel recipe to use a tag. Subbed
 solidified xp for experience bottles in the solidifier recipe so its actually
 bootstrap craftable.

---
 .../resources/.cache/2a0621f54729484bb667bdf33a347c218c756998 | 4 ++--
 .../resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 ++--
 .../data/actuallyadditions/recipe/solid_fuel/coal-block.json  | 2 +-
 .../data/actuallyadditions/recipe/xp_solidifier.json          | 2 +-
 .../ellpeck/actuallyadditions/data/BlockRecipeGenerator.java  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/generated/resources/.cache/2a0621f54729484bb667bdf33a347c218c756998 b/src/generated/resources/.cache/2a0621f54729484bb667bdf33a347c218c756998
index 4c0b0c614..d979e1282 100644
--- a/src/generated/resources/.cache/2a0621f54729484bb667bdf33a347c218c756998
+++ b/src/generated/resources/.cache/2a0621f54729484bb667bdf33a347c218c756998
@@ -1,10 +1,10 @@
-// 1.21.1	2024-08-11T19:30:01.8163216	Fuel Recipes
+// 1.21.1	2024-11-17T13:53:47.3739458	Fuel Recipes
 76f02a2cc4d39ec2adb71fbe0ac6da3a1b31ff9d data/actuallyadditions/recipe/liquid_fuel/canola_oil.json
 6b23d46a93b3e67bb58858c13becd6bd3f348f6f data/actuallyadditions/recipe/liquid_fuel/crystallized_canola_oil.json
 056a848bc5c836985a9f080c3a540bf97e710f2a data/actuallyadditions/recipe/liquid_fuel/empowered_canola_oil.json
 0f6dd7157c080d139886b390000aa075aaa658cd data/actuallyadditions/recipe/liquid_fuel/refined_canola_oil.json
 0732b5aebc03718a2adf8710c149021b1bc05eb7 data/actuallyadditions/recipe/solid_fuel/charcoal.json
-5a8956fa96bf886b5b13d3359ee58dcaee9b87cc data/actuallyadditions/recipe/solid_fuel/coal-block.json
+390939de1b4699a714ed3d5c3e67e4e5df7b5135 data/actuallyadditions/recipe/solid_fuel/coal-block.json
 d6dbd4428a27289d3407a7609c5e8342a0c72b1a data/actuallyadditions/recipe/solid_fuel/coal.json
 50885f04b21b6cdb4a1d41b8d4f1210762c21db9 data/actuallyadditions/recipe/solid_fuel/lava.json
 5bc9490d9ce3874d628644059d2ab3738b267242 data/actuallyadditions/recipe/solid_fuel/stick.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
index b3481e4d2..82b74fa91 100644
--- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
+++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.1	2024-10-19T22:58:03.6472462	Recipes
+// 1.21.1	2024-11-17T13:53:47.3759486	Recipes
 b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
 b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
 660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
@@ -73,4 +73,4 @@ a5bbea36e4e66a6c1aed2b618b6b2782b334963c data/actuallyadditions/recipe/smooth_bl
 f0a6cbd14eac4a35f31b17818a10c3052d848e32 data/actuallyadditions/recipe/tiny_torch.json
 417bba7527a62cea44fd900ce3882000ada36a2c data/actuallyadditions/recipe/vertical_digger.json
 207a2f79e0b0c94905c385aaa0dd843c26fcfa6d data/actuallyadditions/recipe/wood_casing.json
-c5dae80ac00ec9829c80d6e453adcb488e775005 data/actuallyadditions/recipe/xp_solidifier.json
+fb83d89fd0a4c9f266c370c0fda1a53c1878351d data/actuallyadditions/recipe/xp_solidifier.json
diff --git a/src/generated/resources/data/actuallyadditions/recipe/solid_fuel/coal-block.json b/src/generated/resources/data/actuallyadditions/recipe/solid_fuel/coal-block.json
index 393f3c01d..51f31c8da 100644
--- a/src/generated/resources/data/actuallyadditions/recipe/solid_fuel/coal-block.json
+++ b/src/generated/resources/data/actuallyadditions/recipe/solid_fuel/coal-block.json
@@ -2,7 +2,7 @@
   "type": "actuallyadditions:solid_fuel",
   "burn_time": 16000,
   "item": {
-    "item": "minecraft:coal_block"
+    "tag": "c:storage_blocks/coal"
   },
   "total_energy": 320000
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/actuallyadditions/recipe/xp_solidifier.json b/src/generated/resources/data/actuallyadditions/recipe/xp_solidifier.json
index 095cc02bf..a4125cb72 100644
--- a/src/generated/resources/data/actuallyadditions/recipe/xp_solidifier.json
+++ b/src/generated/resources/data/actuallyadditions/recipe/xp_solidifier.json
@@ -9,7 +9,7 @@
       "item": "actuallyadditions:empowered_diamatine_crystal_block"
     },
     "S": {
-      "item": "actuallyadditions:solidified_experience"
+      "item": "minecraft:experience_bottle"
     }
   },
   "pattern": [
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
index c1d642f57..a63d89dba 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
@@ -511,7 +511,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
         // Experience Solidifier
         Recipe.shaped(ActuallyBlocks.XP_SOLIDIFIER.getItem())
                 .pattern("SSS", "EAE", "SSS")
-                .define('S', ActuallyItems.SOLIDIFIED_EXPERIENCE)
+                .define('S', Items.EXPERIENCE_BOTTLE)
                 .define('E', ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.getItem())
                 .define('A', ActuallyItems.ADVANCED_COIL)
                 .save(recipeOutput);