Merge pull request #74 from CamoMano/1.21-dev

1.21 dev

gradle.properties

@@ -10,7 +10,7 @@ yarn_mappings_version=1.21+build.7
 fabric_loader_version=0.15.11
 fabric_api_version=0.100.6+1.21
 # Mod Properties
-mod_version=4.1
+mod_version=4.1.1
 maven_group=com.enrichedmc
 archives_base_name=enriched
 # Dependencies

src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223

@@ -1,13 +1,20 @@
-// 1.21	2024-07-08T11:51:51.783504	Enriched/Tags for minecraft:block
+// 1.21	2024-07-08T19:07:18.9995461	Enriched/Tags for minecraft:block
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_ruby_tool.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\block\redwood_logs.json
+cbffea030c16b76cef765b05e3c84e50fb62855a data\minecraft\tags\block\mineable\axe.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_emerald_tool.json
 bff61c01ce77db92c1b08ffaaf5e7458cf3a8876 data\minecraft\tags\block\needs_iron_tool.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_steel_tool.json
+25fdf63da1fa45e77e081e6a5665e33ac1a6e2ec data\minecraft\tags\block\walls.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_obsidian_tool.json
-681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\block\planks.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_tanzanite_tool.json
+681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\block\planks.json
 75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\block\logs_that_burn.json
-505fa84668bc20d712c8653f9d2158a8c7e38072 data\minecraft\tags\block\mineable\pickaxe.json
+fee3dc8eb98867f287b18093a7005018fe943012 data\minecraft\tags\block\leaves.json
+69aa3d1eeed3ac4e72a293913a933c96f034b5fd data\minecraft\tags\block\mineable\pickaxe.json
+9db68236f7a767c0e08b8088912b86e14fc091f3 data\minecraft\tags\block\stairs.json
+e2c8e2af57b9edfb4ca0d3615f21877694656376 data\minecraft\tags\block\slabs.json
+5b2791a469905a7d1d06a1fdb2780da2ed36e84d data\minecraft\tags\block\wooden_slabs.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_copper_tool.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_sapphire_tool.json
+de2094bea0e4758af28756315ad17e9336ffadec data\minecraft\tags\block\wooden_stairs.json

src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T11:51:51.7814976	Enriched/Block Loot Tables
+// 1.21	2024-07-08T19:07:18.9985392	Enriched/Block Loot Tables
 de886d29608aa25104c1b2e8d6f056a55c95549a data\enriched\loot_table\blocks\polished_dark_granite_stairs.json
 58b8c0cbcc1f69bf41c5952003634e84f9b358f6 data\enriched\loot_table\blocks\steel_block.json
 c2ea10b722d238b6880fb7a966b95763936ee841 data\enriched\loot_table\blocks\stripped_redwood_log.json

src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd

@@ -1,4 +1,11 @@
-// 1.21	2024-07-08T11:51:51.7825052	Enriched/Tags for minecraft:item
+// 1.21	2024-07-08T19:07:18.9985392	Enriched/Tags for minecraft:item
+7de72c45ab014b3a47886aa8c9c699f9f1f1635d data\c\tags\item\ores.json
+a94b97d224da0464fc2bd7209ff67b8238e3302d data\c\tags\item\tools\melee_weapon.json
 681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\item\planks.json
+4d1a35e2634756e0e1191a849f4932e5ca07752d data\c\tags\item\tools\mining_tool.json
+319a81d192361fb43916d37d5ec64108ff99836d data\c\tags\item\ingots.json
 75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\item\logs_that_burn.json
+863ffe88aba59791de3bc9fd39e1c36c3fdac1ef data\c\tags\item\dusts.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\item\redwood_logs.json
+89c60d3304c60899777e0814e2f178bc98f1b380 data\c\tags\item\tools.json
+cef670a6b27fb5fd943fa55d23ea352f847db879 data\c\tags\item\armors.json

src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T11:51:51.7729213	Enriched/Recipes
+// 1.21	2024-07-08T19:07:18.9902606	Enriched/Recipes
 bddaf0484c3f36e7a3db02a1538562976e33553a data\enriched\recipe\steel_blend.json
 7a034820fe10d3bef7737462418cbb790e3c2bf5 data\enriched\advancement\recipes\tools\ruby_pickaxe.json
 b86af3b61d52ef9464d07d781c16767cb10c75be data\enriched\advancement\recipes\tools\sapphire_pickaxe.json

src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d

@@ -1,2 +1,2 @@
-// 1.21	2024-07-08T11:51:51.7814976	Enriched/Language (en_us)
+// 1.21	2024-07-08T19:07:18.9980341	Enriched/Language (en_us)
 14fbaa364d29a02102981d88beb99062d29d12fd assets\enriched\lang\en_us.json

src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T11:51:51.7779467	Enriched/Model Definitions
+// 1.21	2024-07-08T19:07:18.9939767	Enriched/Model Definitions
 edf46cfca1cc6e5d65214045edbf116e3e42645b assets\enriched\models\item\obsidian_sword.json
 b1f2d95256cfcb699a1dac06b306ed086db40f7c assets\enriched\models\block\redwood_log_horizontal.json
 95d2f1008dc3460e4132fbfcc5f3e3aacf37236c assets\enriched\models\item\emerald_chestplate_netherite_trim.json
@@ -164,8 +164,8 @@ fb370d900104d8a9b2f860632855234531f77ddc assets\enriched\blockstates\marble_slab
 5a81db71bd7c09a9f274bbec71300be22bac5023 assets\enriched\blockstates\stripped_redwood_wood.json
 9c604fd9699edc193029306d720ed3b94e963c2d assets\enriched\models\block\polished_dark_granite_stairs_outer.json
 53cf037f5dc469c8f597aee0187e9357cb59101f assets\enriched\models\block\redwood_fence_inventory.json
-b9db21ceea2a68098f771942b2488de9fa330cf2 assets\enriched\blockstates\steel_block.json
 37f203a2e38bdc8559be39ccb40458e0a3e87b70 assets\enriched\models\block\redwood_stairs_outer.json
+b9db21ceea2a68098f771942b2488de9fa330cf2 assets\enriched\blockstates\steel_block.json
 bcc8b059a47fb5b4ee7a23e7e7a7e41ed4f369f4 assets\enriched\models\item\steel_boots_quartz_trim.json
 8c92d52ef857146824ca81a835f92f4f1507b601 assets\enriched\models\item\emerald_axe.json
 951218e0ff94ea7d136b7ad3ffb49e9755249788 assets\enriched\models\item\emerald_helmet_gold_trim.json
@@ -334,8 +334,8 @@ b793f014f90d6edd5426fc260cca5a7878bce352 assets\enriched\models\item\ruby_helmet
 fb8c690d5a624908e4bf76336ee0340844d9a91b assets\enriched\models\block\redwood_planks.json
 b849ac41c6e407651bd9888fcb55a842fcf865f5 assets\enriched\models\item\obsidian_pickaxe.json
 5b62c74a0d34e8c10a94cee8ff18c73d54753164 assets\enriched\models\block\redwood_fence_post.json
-b35a3f0493528fef4853ca54fee442da1b8acd04 assets\enriched\blockstates\tanzanite_ore.json
 5542b3a72f3148bd77c7da8bcc4ca5fd07b9a0e2 assets\enriched\blockstates\redwood_pressure_plate.json
+b35a3f0493528fef4853ca54fee442da1b8acd04 assets\enriched\blockstates\tanzanite_ore.json
 eb218067ba4d35402c01022733b9f0481a6db98f assets\enriched\models\item\ruby_block.json
 df244732b43c315845ce8f390b6c0eaaaf1f1909 assets\enriched\models\item\tanzanite_boots_redstone_trim.json
 6db3d995ff803db88709060ffa976da5200e60fd assets\enriched\models\item\steel_helmet_redstone_trim.json

src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T11:51:51.7799857	Enriched/World Gen
+// 1.21	2024-07-08T19:07:18.9970342	Enriched/World Gen
 7f3ba33122767010a50baac5de81e114e519f6ad data\enriched\worldgen\placed_feature\tanzanite_ore_placed.json
 74b8741399af43f74b822c4871969e5bca17f806 data\enriched\worldgen\placed_feature\redwood_placed.json
 bf917c1184cf2a02e434ed262654531dd877225c data\enriched\worldgen\placed_feature\sapphire_ore_placed.json
@@ -12,10 +12,10 @@ e14b485532e4520e024c038297232c9bbecd12cd data\enriched\worldgen\placed_feature\m
 fb55d37a9c27a27debdbdfaac638816b0cd9915e data\enriched\worldgen\configured_feature\ruby_ore_common.json
 efc4a8da1d3e5c6535274e05465cfdb03daf2f10 data\enriched\worldgen\configured_feature\ruby_ore.json
 42eb2267c6afffd304729ea09b31e5c42aa68393 data\enriched\worldgen\placed_feature\ruby_ore_common_placed.json
-5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_placed.json
 780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json
-907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json
+5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_placed.json
 0debc68e92df367fabafe5de0b1151d890a44649 data\enriched\worldgen\configured_feature\tanzanite_ore_common.json
+907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json
 30dd6b9471bab1ed1a1a1698b8d1c2662050496c data\enriched\worldgen\placed_feature\ruby_ore_placed.json
 12a7c9d3432dd5351d59c00067565b80af894cfe data\enriched\worldgen\configured_feature\sapphire_ore_common.json
 71248373ac42abaa325429bbf4bc62a5c8990ebb data\enriched\worldgen\configured_feature\sapphire_ore.json

src/main/generated/data/c/tags/item/armors.json

@@ -0,0 +1,28 @@
+{
+  "values": [
+    "enriched:steel_helmet",
+    "enriched:steel_chestplate",
+    "enriched:steel_leggings",
+    "enriched:steel_boots",
+    "enriched:obsidian_helmet",
+    "enriched:obsidian_chestplate",
+    "enriched:obsidian_leggings",
+    "enriched:obsidian_boots",
+    "enriched:ruby_helmet",
+    "enriched:ruby_chestplate",
+    "enriched:ruby_leggings",
+    "enriched:ruby_boots",
+    "enriched:sapphire_helmet",
+    "enriched:sapphire_chestplate",
+    "enriched:sapphire_leggings",
+    "enriched:sapphire_boots",
+    "enriched:tanzanite_helmet",
+    "enriched:tanzanite_chestplate",
+    "enriched:tanzanite_leggings",
+    "enriched:tanzanite_boots",
+    "enriched:emerald_helmet",
+    "enriched:emerald_chestplate",
+    "enriched:emerald_leggings",
+    "enriched:emerald_boots"
+  ]
+}

src/main/generated/data/c/tags/item/dusts.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "enriched:obsidian_alloy_blend",
+    "enriched:steel_blend"
+  ]
+}

src/main/generated/data/c/tags/item/ingots.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "enriched:obsidian_alloy_ingot",
+    "enriched:steel_ingot"
+  ]
+}

src/main/generated/data/c/tags/item/ores.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "enriched:ruby_ore",
+    "enriched:sapphire_ore",
+    "enriched:tanzanite_ore",
+    "enriched:steel_ingot"
+  ]
+}

src/main/generated/data/c/tags/item/tools.json

@@ -0,0 +1,32 @@
+{
+  "values": [
+    "enriched:steel_axe",
+    "enriched:steel_hoe",
+    "enriched:steel_shovel",
+    "enriched:steel_pickaxe",
+    "enriched:obsidian_axe",
+    "enriched:obsidian_hoe",
+    "enriched:obsidian_shovel",
+    "enriched:obsidian_pickaxe",
+    "enriched:copper_axe",
+    "enriched:copper_hoe",
+    "enriched:copper_shovel",
+    "enriched:copper_pickaxe",
+    "enriched:ruby_axe",
+    "enriched:ruby_hoe",
+    "enriched:ruby_shovel",
+    "enriched:ruby_pickaxe",
+    "enriched:sapphire_axe",
+    "enriched:sapphire_hoe",
+    "enriched:sapphire_shovel",
+    "enriched:sapphire_pickaxe",
+    "enriched:tanzanite_axe",
+    "enriched:tanzanite_hoe",
+    "enriched:tanzanite_shovel",
+    "enriched:tanzanite_pickaxe",
+    "enriched:emerald_axe",
+    "enriched:emerald_hoe",
+    "enriched:emerald_shovel",
+    "enriched:emerald_pickaxe"
+  ]
+}

src/main/generated/data/c/tags/item/tools/melee_weapon.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_sword",
+    "enriched:obsidian_sword",
+    "enriched:ruby_sword",
+    "enriched:sapphire_sword",
+    "enriched:tanzanite_sword",
+    "enriched:emerald_sword",
+    "enriched:copper_sword"
+  ]
+}

src/main/generated/data/c/tags/item/tools/mining_tool.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_pickaxe",
+    "enriched:obsidian_pickaxe",
+    "enriched:copper_pickaxe",
+    "enriched:ruby_pickaxe",
+    "enriched:sapphire_pickaxe",
+    "enriched:tanzanite_pickaxe",
+    "enriched:emerald_pickaxe"
+  ]
+}

src/main/generated/data/minecraft/tags/block/leaves.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:redwood_leaves"
+  ]
+}

src/main/generated/data/minecraft/tags/block/mineable/axe.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "enriched:redwood_log",
+    "enriched:redwood_wood",
+    "enriched:stripped_redwood_log",
+    "enriched:stripped_redwood_wood",
+    "enriched:redwood_planks"
+  ]
+}

src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -8,6 +8,20 @@
     "enriched:deepslate_sapphire_ore",
     "enriched:tanzanite_block",
     "enriched:tanzanite_ore",
-    "enriched:deepslate_tanzanite_ore"
+    "enriched:deepslate_tanzanite_ore",
+    "enriched:dark_granite",
+    "enriched:dark_granite_slab",
+    "enriched:dark_granite_stairs",
+    "enriched:dark_granite_wall",
+    "enriched:polished_dark_granite",
+    "enriched:polished_dark_granite_slab",
+    "enriched:polished_dark_granite_stairs",
+    "enriched:marble",
+    "enriched:marble_slab",
+    "enriched:marble_stairs",
+    "enriched:marble_wall",
+    "enriched:polished_marble",
+    "enriched:polished_marble_slab",
+    "enriched:polished_marble_stairs"
   ]
 }

src/main/generated/data/minecraft/tags/block/slabs.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "enriched:dark_granite_slab",
+    "enriched:polished_dark_granite_slab",
+    "enriched:marble_slab",
+    "enriched:polished_marble_slab",
+    "enriched:polished_marble_stairs"
+  ]
+}

src/main/generated/data/minecraft/tags/block/stairs.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "enriched:dark_granite_stairs",
+    "enriched:polished_dark_granite_stairs",
+    "enriched:marble_stairs",
+    "enriched:polished_marble_stairs",
+    "enriched:polished_marble_stairs"
+  ]
+}

src/main/generated/data/minecraft/tags/block/walls.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "enriched:dark_granite_wall",
+    "enriched:marble_wall"
+  ]
+}

src/main/generated/data/minecraft/tags/block/wooden_slabs.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:redwood_slab"
+  ]
+}

src/main/generated/data/minecraft/tags/block/wooden_stairs.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:redwood_stairs"
+  ]
+}

src/main/java/com/enrichedmc/enriched/conditions/EnrichedResourceConditions.java

@@ -18,6 +18,8 @@ public class EnrichedResourceConditions {
   public static final ResourceCondition RAW_SMELTING_ENABLED;
   public static final ResourceCondition UNCRAFTING_ENABLED;
 
+  public static final ResourceCondition FOOD_ENABLED;
+
   static {
     RUBY_ENABLED = new RubyResourceCondition();
     SAPPHIRE_ENABLED = new SapphireResourceCondition();
@@ -30,6 +32,7 @@ public class EnrichedResourceConditions {
     CHAINMAIL_ENABLED = new ChainmailResourceCondition();
     RAW_SMELTING_ENABLED = new RawSmeltingResourceCondition();
     UNCRAFTING_ENABLED = new UncraftingResourceCondition();
+    FOOD_ENABLED = new FoodResourceCondition();
 
     ResourceConditions.register(RUBY_ENABLED.getType());
     ResourceConditions.register(SAPPHIRE_ENABLED.getType());
@@ -42,6 +45,7 @@ public class EnrichedResourceConditions {
     ResourceConditions.register(CHAINMAIL_ENABLED.getType());
     ResourceConditions.register(RAW_SMELTING_ENABLED.getType());
     ResourceConditions.register(UNCRAFTING_ENABLED.getType());
+    ResourceConditions.register(FOOD_ENABLED.getType());
   }
 
   public static void registerResourceConditions() {

src/main/java/com/enrichedmc/enriched/conditions/impl/FoodResourceCondition.java

@@ -0,0 +1,23 @@
+package com.enrichedmc.enriched.conditions.impl;
+
+import com.enrichedmc.enriched.EnrichedMod;
+import com.mojang.serialization.MapCodec;
+import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
+import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
+
+public class FoodResourceCondition implements ResourceCondition {
+  @Override
+  public ResourceConditionType<?> getType() {
+    return ResourceConditionType.create(
+        Identifier.of(EnrichedMod.MOD_ID, "food_enabled"),
+        MapCodec.unit(FoodResourceCondition::new));
+  }
+
+  @Override
+  public boolean test(@Nullable RegistryWrapper.WrapperLookup registryLookup) {
+    return EnrichedMod.getInstance().getGameOptions().recipeOptions.enableFoodRecipes;
+  }
+}