Mod compatibility fixes and features.

- Craft Mycelium from Mushrooms and Farmer's Delight Rich Soil - Fix Farmer's Delight Cutting Board stripping vanilla Cherry logs - Make Farmer's Delight crops maintain dry vanilla Farmland
gniftygnome · Nov 6, 2023 · 9a3c6f4 · 9a3c6f4
1 parent d81e4c5
commit 9a3c6f4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.20
 yarn_mappings=1.20+build.1
 loader_version=0.14.22
 # Mod Properties
-mod_version=0.2.1
+mod_version=0.2.2
 maven_group=net.gnomecraft
 archives_base_name=skys-the-limit
 # Dependencies

diff --git a/src/main/java/net/gnomecraft/skysthelimit/config/SkysTheLimitConfig.java b/src/main/java/net/gnomecraft/skysthelimit/config/SkysTheLimitConfig.java
@@ -59,6 +59,9 @@ public class SkysTheLimitConfig implements ConfigData {
     @ConfigEntry.Category("recipes")
     public Boolean mossCarpetToBlocks = true;
 
+    @ConfigEntry.Category("recipes")
+    public Boolean richSoilToMycelium = true;
+
     @ConfigEntry.Category("recipes")
     public Boolean smeltDirtToIron = true;
 

diff --git a/src/main/java/net/gnomecraft/skysthelimit/data/SkysTheLimitBlockTagProvider.java b/src/main/java/net/gnomecraft/skysthelimit/data/SkysTheLimitBlockTagProvider.java
@@ -1,5 +1,6 @@
 package net.gnomecraft.skysthelimit.data;
 
+import com.nhoryzon.mc.farmersdelight.registry.BlocksRegistry;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.gnomecraft.skysthelimit.block.SkysTheLimitBlocks;
@@ -18,9 +19,19 @@ public SkysTheLimitBlockTagProvider(FabricDataOutput output, CompletableFuture<R
     @Override
     protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
         // basic block tags
+
+        // Work around Farmer's Delight issue #206
+        this.getOrCreateTagBuilder(BlockTags.MAINTAINS_FARMLAND)
+                .add(BlocksRegistry.BUDDING_TOMATO_CROP.get())
+                .add(BlocksRegistry.CABBAGE_CROP.get())
+                .add(BlocksRegistry.ONION_CROP.get())
+                .add(BlocksRegistry.TOMATO_CROP.get());
+
         this.getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
                 .add(SkysTheLimitBlocks.FOG_CATCHER_BLOCK);
 
+        // common tags
+
         // Make sure vanilla overworld base stone is in c:stone
         this.getOrCreateTagBuilder(SkysTheLimitBlockTags.COMMON_STONE)
                 .add(Blocks.STONE)

diff --git a/src/main/java/net/gnomecraft/skysthelimit/data/SkysTheLimitRecipeProvider.java b/src/main/java/net/gnomecraft/skysthelimit/data/SkysTheLimitRecipeProvider.java
@@ -80,6 +80,16 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
                 .criterion("has_seeds", InventoryChangedCriterion.Conditions.items(Items.WHEAT_SEEDS))
                 .offerTo(withConditions(exporter, SkysTheLimitResourceConditions.allConfigBooleansEnabled("dirtToGrassBlock")));
 
+        new ShapedRecipeJsonBuilder(RecipeCategory.BUILDING_BLOCKS, Items.MYCELIUM, 1)
+                .group("dirt")
+                .pattern("mmm")
+                .pattern("mdm")
+                .pattern("mmm")
+                .input('d', ItemsRegistry.RICH_SOIL.get())
+                .input('m', Ingredient.ofItems(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM))
+                .criterion("has_mushrooms", InventoryChangedCriterion.Conditions.items(ItemsRegistry.RICH_SOIL.get()))
+                .offerTo(withConditions(exporter, SkysTheLimitResourceConditions.allConfigBooleansEnabled("richSoilToMycelium")));
+
         new ShapelessRecipeJsonBuilder(RecipeCategory.BUILDING_BLOCKS, Items.MOSS_BLOCK, 2)
                 .group("moss")
                 .input(Items.BONE_MEAL)

diff --git a/src/main/resources/assets/skys-the-limit/lang/en_us.json b/src/main/resources/assets/skys-the-limit/lang/en_us.json
@@ -31,6 +31,7 @@
   "text.autoconfig.skys-the-limit.option.craftableSaddle": "Craft saddles?",
   "text.autoconfig.skys-the-limit.option.dirtToGrassBlock": "Craft grass blocks from dirt and wheat seeds?",
   "text.autoconfig.skys-the-limit.option.mossCarpetToBlocks": "Craft moss blocks from moss carpet + bone meal?",
+  "text.autoconfig.skys-the-limit.option.richSoilToMycelium": "Craft mycelium from rich soil and mushrooms?",
   "text.autoconfig.skys-the-limit.option.smeltDirtToIron": "Smelt dirt to iron bloom; craft raw iron?",
   "text.autoconfig.skys-the-limit.option.snowToWater": "Smelt powder snow buckets into water buckets?",
   "text.autoconfig.skys-the-limit.option.stonesToStoneBucket": "Craft mixed stones into cobblestone?",

diff --git a/src/main/resources/data/farmersdelight/recipes/cutting/cherry_log.json b/src/main/resources/data/farmersdelight/recipes/cutting/cherry_log.json
@@ -3,15 +3,14 @@
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
-        "farmersdelight",
-        "terrestria"
+        "farmersdelight"
       ]
     }
   ],
   "type": "farmersdelight:cutting",
   "ingredients": [
     {
-      "item": "terrestria:cherry_log"
+      "item": "minecraft:cherry_log"
     }
   ],
   "tool": {
@@ -20,7 +19,7 @@
   },
   "result": [
     {
-      "item": "terrestria:stripped_cherry_log"
+      "item": "minecraft:stripped_cherry_log"
     },
     {
       "item": "farmersdelight:tree_bark"

diff --git a/src/main/resources/data/farmersdelight/recipes/cutting/cherry_wood.json b/src/main/resources/data/farmersdelight/recipes/cutting/cherry_wood.json
@@ -3,15 +3,14 @@
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
-        "farmersdelight",
-        "terrestria"
+        "farmersdelight"
       ]
     }
   ],
   "type": "farmersdelight:cutting",
   "ingredients": [
     {
-      "item": "terrestria:cherry_wood"
+      "item": "minecraft:cherry_wood"
     }
   ],
   "tool": {
@@ -20,7 +19,7 @@
   },
   "result": [
     {
-      "item": "terrestria:stripped_cherry_wood"
+      "item": "minecraft:stripped_cherry_wood"
     },
     {
       "item": "farmersdelight:tree_bark"