diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1c30c..e5e67dc 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ***
 
+## 1.16.x-1.0.3
+Since 1.17 is out now, the quest to port EarlyGame to 1.17 has begun! Updates are still slow, but I'll try my best to update as much as I can!
+- (*) Common stick tag in all tool recipes for better compatibility with mods that add modded sticks
+- (*) Revamped prop generation with a (kind of) new feature generation algorithm
+- (*) Rock generation can now be disabled
+
 ## 1.16.x-1.0.2
 - (+) You can now get plant fiber from ferns
 - (*) Compatibility with sticks from ATBYW (#17)
diff --git a/README.md b/README.md
index e06b959..728701a 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 <a href="https://github.com/JayCeeCreates/earlygame/blob/master/LICENSE"><img src="https://img.shields.io/github/license/jayceecreates/earlygame?style=for-the-badge"></a>
 <img src="https://img.shields.io/badge/mc%20version-1.16.x-brightgreen?style=for-the-badge">
-<img src="https://img.shields.io/badge/mod%20version-1.0.2-yellow?style=for-the-badge">
+<img src="https://img.shields.io/badge/mod%20version-1.0.3-yellow?style=for-the-badge">
 <a href="https://fabricmc.net"><img src="https://img.shields.io/badge/modloader-fabric-blue?style=for-the-badge"></a>
 </p>
 
@@ -57,6 +57,10 @@ More details are in the [wiki](https://github.com/JayCeeCreates/earlygame/wiki).
 
 Incompatibilities and bugs can be reported in the [issues](https://github.com/JayCeeCreates/earlygame/issues) section.
 
+## Recommended Mods
+
+- **[Unlit Campfire](https://www.curseforge.com/minecraft/mc-mods/unlit-campfire)**: placing campfires on unlit state by default
+
 ## Credits
 
 - **Fabric Discord community** (a great help for the code)
diff --git a/gradle.properties b/gradle.properties
index 2b8e8e3..e6572cd 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.1
 
 # Mod Properties
-	mod_version = 1.16.x-1.0.2
+	mod_version = 1.16.x-1.0.3
 	maven_group = jayceecreates.earlygame
 	archives_base_name = earlygame
 
diff --git a/src/main/java/jayceecreates/earlygame/EarlyGame.java b/src/main/java/jayceecreates/earlygame/EarlyGame.java
index f548fcc..11bc45a 100644
--- a/src/main/java/jayceecreates/earlygame/EarlyGame.java
+++ b/src/main/java/jayceecreates/earlygame/EarlyGame.java
@@ -2,7 +2,9 @@
 
 import jayceecreates.earlygame.config.EarlyGameConfig;
 import jayceecreates.earlygame.init.*;
+import jayceecreates.earlygame.utils.ModConfiguredFeatures;
 import jayceecreates.earlygame.world.CopperOreGen;
+
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
@@ -18,6 +20,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+@SuppressWarnings("deprecation")
 public class EarlyGame implements ModInitializer {
     
     public static EarlyGameConfig CONFIG;
@@ -25,7 +28,6 @@ public class EarlyGame implements ModInitializer {
     public static final Logger LOGGER = LogManager.getLogger("EarlyGame");
 
     @Override
-    @SuppressWarnings("deprecation")
     public void onInitialize() {
         
         // config
@@ -38,10 +40,15 @@ public void onInitialize() {
         EventsInit.init();
 
         // world gen
-        RegistryKey<ConfiguredFeature<?, ?>> copperOreGen = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN,
-            new Identifier("earlygame", "copper_ore_gen"));
+        RegistryKey<ConfiguredFeature<?, ?>> copperOreGen = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("earlygame", "copper_ore_gen"));
+        RegistryKey<ConfiguredFeature<?, ?>> stickTwigGen = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("earlygame", "stick_twig_gen"));
+        RegistryKey<ConfiguredFeature<?, ?>> stoneRockGen = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("earlygame", "stone_rock_gen"));
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, copperOreGen.getValue(), CopperOreGen.COPPER_ORE_GEN);
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, stickTwigGen.getValue(), ModConfiguredFeatures.STICK_TWIG);
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, stoneRockGen.getValue(), ModConfiguredFeatures.ROCK_BLOCK);
         if (CONFIG.generateCopper) BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, copperOreGen);
+        if (CONFIG.generateSticks) BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, stickTwigGen);
+        if (CONFIG.generateStones) BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, stoneRockGen);
         
     }
     
diff --git a/src/main/java/jayceecreates/earlygame/config/EarlyGameConfig.java b/src/main/java/jayceecreates/earlygame/config/EarlyGameConfig.java
index 9314e80..5073f86 100755
--- a/src/main/java/jayceecreates/earlygame/config/EarlyGameConfig.java
+++ b/src/main/java/jayceecreates/earlygame/config/EarlyGameConfig.java
@@ -11,6 +11,11 @@ public class EarlyGameConfig implements ConfigData {
     public boolean warningMessage = false;
 
     @ConfigEntry.Gui.Tooltip(count = 6)
+    @ConfigEntry.Gui.RequiresRestart
+    public boolean generateStones = true;
+
+    @ConfigEntry.Gui.Tooltip(count = 6)
+    @ConfigEntry.Gui.RequiresRestart
     public boolean generateSticks = true;
 
     @ConfigEntry.Gui.Tooltip(count = 8)
diff --git a/src/main/java/jayceecreates/earlygame/mixin/CopperOreGenMixin.java b/src/main/java/jayceecreates/earlygame/mixin/CopperOreGenMixin.java
deleted file mode 100644
index 3acfcab..0000000
--- a/src/main/java/jayceecreates/earlygame/mixin/CopperOreGenMixin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*package jayceecreates.earlygame.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import jayceecreates.earlygame.world.CopperOreGen;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
-
-@Mixin(DefaultBiomeFeatures.class)
-public class CopperOreGenMixin {
-    
-    @Inject(
-        method = "addDefaultOres(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addDefaultOres(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, CopperOreGen.COPPER_ORE_GEN);
-    }
-
-}*/
\ No newline at end of file
diff --git a/src/main/java/jayceecreates/earlygame/mixin/StickTwigGenMixin.java b/src/main/java/jayceecreates/earlygame/mixin/StickTwigGenMixin.java
deleted file mode 100644
index 0cbc2f8..0000000
--- a/src/main/java/jayceecreates/earlygame/mixin/StickTwigGenMixin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package jayceecreates.earlygame.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import jayceecreates.earlygame.utils.ModConfiguredFeatures;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
-
-@Mixin(DefaultBiomeFeatures.class)
-public class StickTwigGenMixin {
-    
-    @Inject(
-        method = "addPlainsFeatures(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addPlainsFeatures(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addForestGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addForestGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addJungleGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addJungleGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addShatteredSavannaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addShatteredSavannaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addSavannaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addSavannaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addBadlandsGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addBadlandsGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addSwampFeatures(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addSwampFeatures(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addDesertDeadBushes(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addDesertDeadBushes(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addGiantTaigaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addGiantTaigaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addDefaultGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addDefaultGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-
-    @Inject(
-        method = "addTaigaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addTaigaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.STICK_TWIG);
-    }
-    
-}
diff --git a/src/main/java/jayceecreates/earlygame/mixin/StoneRockGenMixin.java b/src/main/java/jayceecreates/earlygame/mixin/StoneRockGenMixin.java
deleted file mode 100644
index f9fc6be..0000000
--- a/src/main/java/jayceecreates/earlygame/mixin/StoneRockGenMixin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package jayceecreates.earlygame.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import jayceecreates.earlygame.utils.ModConfiguredFeatures;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
-
-@Mixin(DefaultBiomeFeatures.class)
-public class StoneRockGenMixin {
-    
-    @Inject(
-        method = "addPlainsFeatures(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addPlainsFeatures(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addForestGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addForestGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addJungleGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addJungleGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addShatteredSavannaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addShatteredSavannaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addSavannaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addSavannaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addBadlandsGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addBadlandsGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addSwampFeatures(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addSwampFeatures(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addDesertDeadBushes(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addDesertDeadBushes(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addGiantTaigaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addGiantTaigaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addDefaultGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addDefaultGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-
-    @Inject(
-        method = "addTaigaGrass(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V",
-        at = @At("TAIL")
-    )
-    private static void addTaigaGrass(GenerationSettings.Builder builder, CallbackInfo ci) {
-        builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, ModConfiguredFeatures.ROCK_BLOCK);
-    }
-    
-}
diff --git a/src/main/java/jayceecreates/earlygame/utils/ModConfiguredFeatures.java b/src/main/java/jayceecreates/earlygame/utils/ModConfiguredFeatures.java
index 34766bb..6f730dd 100644
--- a/src/main/java/jayceecreates/earlygame/utils/ModConfiguredFeatures.java
+++ b/src/main/java/jayceecreates/earlygame/utils/ModConfiguredFeatures.java
@@ -1,28 +1,19 @@
 package jayceecreates.earlygame.utils;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.Registry;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.ConfiguredFeatures;
 import net.minecraft.world.gen.feature.FeatureConfig;
 
 public class ModConfiguredFeatures {
-   public static final ConfiguredFeature<?, ?> ROCK_BLOCK = Registry.register(
-      BuiltinRegistries.CONFIGURED_FEATURE,
-      new Identifier("earlygame", "rock_block_gen"),
+   public static final ConfiguredFeature<?, ?> ROCK_BLOCK = 
       ModFeature.ROCK_BLOCK_FEATURE
          .configure(FeatureConfig.DEFAULT)
          .decorate(ConfiguredFeatures.Decorators.SQUARE_HEIGHTMAP)
-         .repeat(4)
-   );
+         .repeat(4);
 
-   public static final ConfiguredFeature<?, ?> STICK_TWIG = Registry.register(
-      BuiltinRegistries.CONFIGURED_FEATURE,
-      new Identifier("earlygame", "stick_twig_gen"),
+   public static final ConfiguredFeature<?, ?> STICK_TWIG = 
       ModFeature.STICK_TWIG_FEATURE
          .configure(FeatureConfig.DEFAULT)
          .decorate(ConfiguredFeatures.Decorators.SQUARE_HEIGHTMAP)
-         .repeat(3)
-   );
+         .repeat(3);
 }
diff --git a/src/main/java/jayceecreates/earlygame/world/StickTwigGen.java b/src/main/java/jayceecreates/earlygame/world/StickTwigGen.java
index b4543b6..7b00062 100644
--- a/src/main/java/jayceecreates/earlygame/world/StickTwigGen.java
+++ b/src/main/java/jayceecreates/earlygame/world/StickTwigGen.java
@@ -4,7 +4,6 @@
 
 import com.mojang.serialization.Codec;
 
-import jayceecreates.earlygame.EarlyGame;
 import jayceecreates.earlygame.init.BlocksInit;
 import jayceecreates.earlygame.utils.ModBlockTags;
 import net.minecraft.block.BlockState;
@@ -22,17 +21,14 @@ public StickTwigGen(Codec<DefaultFeatureConfig> configCodec) {
 
     @Override
     public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos,
-            DefaultFeatureConfig featureConfig) {
-        if (EarlyGame.CONFIG.generateSticks) {
-            BlockState stateAt = world.getBlockState(pos);
-            BlockState stateDown = world.getBlockState(pos.down());
-            if (stateAt.isAir() && ModBlockTags.ROCK_PLACEABLE_ON.contains(stateDown.getBlock())) {
-                world.setBlockState(pos, BlocksInit.STICK_TWIG_BLOCK.getDefaultState(), 3);
-                return true;
-            }
+        DefaultFeatureConfig featureConfig) {
+        BlockState stateAt = world.getBlockState(pos);
+        BlockState stateDown = world.getBlockState(pos.down());
+        if (stateAt.isAir() && ModBlockTags.ROCK_PLACEABLE_ON.contains(stateDown.getBlock())) {
+            world.setBlockState(pos, BlocksInit.STICK_TWIG_BLOCK.getDefaultState(), 3);
             return true;
         }
-        else return false;
+        return false;
     }
 
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/earlygame/lang/en_us.json b/src/main/resources/assets/earlygame/lang/en_us.json
index 690b0e7..47c45ea 100755
--- a/src/main/resources/assets/earlygame/lang/en_us.json
+++ b/src/main/resources/assets/earlygame/lang/en_us.json
@@ -12,13 +12,21 @@
     "text.autoconfig.earlygame.option.warningMessage.@Tooltip[3]": "a wooden or stone material.",
     "text.autoconfig.earlygame.option.warningMessage.@Tooltip[4]": "§7§o(Default: false)",
 
+    "text.autoconfig.earlygame.option.generateStones": "Generate Stones",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[0]": "§6§lGenerate Stones",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[1]": "Set whether you want stones to be generated",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[2]": "in your world or not. If disabled, you can",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[3]": "still mine for rocks with a flint pickaxe.",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[4]": "Requires creation of new world.",
+    "text.autoconfig.earlygame.option.generateStones.@Tooltip[5]": "§7§o(Default: true; Requires restart)",
+
     "text.autoconfig.earlygame.option.generateSticks": "Generate Sticks",
     "text.autoconfig.earlygame.option.generateSticks.@Tooltip[0]": "§6§lGenerate Sticks",
     "text.autoconfig.earlygame.option.generateSticks.@Tooltip[1]": "Set whether you want sticks to be generated",
     "text.autoconfig.earlygame.option.generateSticks.@Tooltip[2]": "in your world or not. If disabled, you can",
-    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[3]": "still get sticks from leaves. You might need",
-    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[4]": "to create a new world for it to take effect.",
-    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[5]": "§7§o(Default: true)",
+    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[3]": "still get sticks from leaves. Requires",
+    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[4]": "creation of new world.",
+    "text.autoconfig.earlygame.option.generateSticks.@Tooltip[5]": "§7§o(Default: true; Requires restart)",
 
     "text.autoconfig.earlygame.option.generateCopper": "Generate Copper Ores",
     "text.autoconfig.earlygame.option.generateCopper.@Tooltip[0]": "§6§lGenerate Copper Ores",
@@ -28,7 +36,7 @@
     "text.autoconfig.earlygame.option.generateCopper.@Tooltip[4]": "are disabled may make your game virtually",
     "text.autoconfig.earlygame.option.generateCopper.@Tooltip[5]": "impossible. You might need to create a",
     "text.autoconfig.earlygame.option.generateCopper.@Tooltip[6]": "new world for it to take effect.",
-    "text.autoconfig.earlygame.option.generateCopper.@Tooltip[7]": "§7§o(Default: true; Requires restart!)",
+    "text.autoconfig.earlygame.option.generateCopper.@Tooltip[7]": "§7§o(Default: true; Requires restart)",
 
     "text.autoconfig.earlygame.option.harderGroundBlocks": "Make Ground Blocks Harder",
     "text.autoconfig.earlygame.option.harderGroundBlocks.@Tooltip[0]": "§6§lMake Ground Blocks Harder",
diff --git a/src/main/resources/data/c/tags/items/sticks.json b/src/main/resources/data/c/tags/items/sticks.json
new file mode 100644
index 0000000..9de1c6b
--- /dev/null
+++ b/src/main/resources/data/c/tags/items/sticks.json
@@ -0,0 +1,6 @@
+{
+	"replace": false,
+	"values": [
+		"minecraft:stick"
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/advancements/fire_starter.json b/src/main/resources/data/earlygame/advancements/fire_starter.json
index 6148671..e31915f 100755
--- a/src/main/resources/data/earlygame/advancements/fire_starter.json
+++ b/src/main/resources/data/earlygame/advancements/fire_starter.json
@@ -21,7 +21,7 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "minecraft:stick"
+                        "tag": "c:sticks"
                     }
                 ]
             }
diff --git a/src/main/resources/data/earlygame/advancements/flint_axe.json b/src/main/resources/data/earlygame/advancements/flint_axe.json
index d963d57..170395d 100755
--- a/src/main/resources/data/earlygame/advancements/flint_axe.json
+++ b/src/main/resources/data/earlygame/advancements/flint_axe.json
@@ -31,7 +31,7 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "minecraft:stick"
+                        "tag": "c:sticks"
                     }
                 ]
             }
diff --git a/src/main/resources/data/earlygame/advancements/flint_knife.json b/src/main/resources/data/earlygame/advancements/flint_knife.json
index 888eaba..ccc073f 100755
--- a/src/main/resources/data/earlygame/advancements/flint_knife.json
+++ b/src/main/resources/data/earlygame/advancements/flint_knife.json
@@ -21,7 +21,7 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "minecraft:stick"
+                        "tag": "c:sticks"
                     }
                 ]
             }
diff --git a/src/main/resources/data/earlygame/advancements/flint_pickaxe.json b/src/main/resources/data/earlygame/advancements/flint_pickaxe.json
index 1534640..f340c4c 100755
--- a/src/main/resources/data/earlygame/advancements/flint_pickaxe.json
+++ b/src/main/resources/data/earlygame/advancements/flint_pickaxe.json
@@ -31,7 +31,7 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "minecraft:stick"
+                        "tag": "c:sticks"
                     }
                 ]
             }
diff --git a/src/main/resources/data/earlygame/advancements/flint_saw.json b/src/main/resources/data/earlygame/advancements/flint_saw.json
index 44c7635..7d37438 100755
--- a/src/main/resources/data/earlygame/advancements/flint_saw.json
+++ b/src/main/resources/data/earlygame/advancements/flint_saw.json
@@ -31,7 +31,7 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "minecraft:stick"
+                        "tag": "c:sticks"
                     }
                 ]
             }
diff --git a/src/main/resources/data/earlygame/advancements/slingshot.json b/src/main/resources/data/earlygame/advancements/slingshot.json
index 9048669..1051b92 100755
--- a/src/main/resources/data/earlygame/advancements/slingshot.json
+++ b/src/main/resources/data/earlygame/advancements/slingshot.json
@@ -31,7 +31,7 @@
           "conditions": {
               "items": [
                   {
-                      "item": "minecraft:stick"
+                      "tag": "c:sticks"
                   }
               ]
           }
diff --git a/src/main/resources/data/earlygame/recipes/copper_axe.json b/src/main/resources/data/earlygame/recipes/copper_axe.json
index ffd2c11..f99ae8e 100755
--- a/src/main/resources/data/earlygame/recipes/copper_axe.json
+++ b/src/main/resources/data/earlygame/recipes/copper_axe.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_axe_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_axe_atbyw.json
deleted file mode 100644
index c8af3b8..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_axe_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "xx",
-        "xy",
-        " y"
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_axe",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_hoe.json b/src/main/resources/data/earlygame/recipes/copper_hoe.json
index 8392e51..25a087f 100755
--- a/src/main/resources/data/earlygame/recipes/copper_hoe.json
+++ b/src/main/resources/data/earlygame/recipes/copper_hoe.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_hoe_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_hoe_atbyw.json
deleted file mode 100644
index c26019b..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_hoe_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "xx",
-        " y",
-        " y"
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_hoe",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_knife.json b/src/main/resources/data/earlygame/recipes/copper_knife.json
index edfa5e7..282e0c2 100755
--- a/src/main/resources/data/earlygame/recipes/copper_knife.json
+++ b/src/main/resources/data/earlygame/recipes/copper_knife.json
@@ -9,7 +9,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_knife_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_knife_atbyw.json
deleted file mode 100644
index 991c828..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_knife_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_knife",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_pickaxe.json b/src/main/resources/data/earlygame/recipes/copper_pickaxe.json
index 4feaf1e..81dc433 100755
--- a/src/main/resources/data/earlygame/recipes/copper_pickaxe.json
+++ b/src/main/resources/data/earlygame/recipes/copper_pickaxe.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_pickaxe_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_pickaxe_atbyw.json
deleted file mode 100644
index 68c8992..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_pickaxe_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "xxx",
-        " y ",
-        " y "
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_pickaxe",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_saw.json b/src/main/resources/data/earlygame/recipes/copper_saw.json
index fc88374..55f0dad 100755
--- a/src/main/resources/data/earlygame/recipes/copper_saw.json
+++ b/src/main/resources/data/earlygame/recipes/copper_saw.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_saw_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_saw_atbyw.json
deleted file mode 100644
index 516decf..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_saw_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "  y",
-        " yx",
-        "yx "
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_saw",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_shovel.json b/src/main/resources/data/earlygame/recipes/copper_shovel.json
index f293dbc..55b9338 100755
--- a/src/main/resources/data/earlygame/recipes/copper_shovel.json
+++ b/src/main/resources/data/earlygame/recipes/copper_shovel.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_shovel_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_shovel_atbyw.json
deleted file mode 100644
index 9b7b240..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_shovel_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_shovel",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/copper_sword.json b/src/main/resources/data/earlygame/recipes/copper_sword.json
index abb742e..f5fe506 100755
--- a/src/main/resources/data/earlygame/recipes/copper_sword.json
+++ b/src/main/resources/data/earlygame/recipes/copper_sword.json
@@ -10,7 +10,7 @@
             "tag": "c:copper_ingots"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/copper_sword_atbyw.json b/src/main/resources/data/earlygame/recipes/copper_sword_atbyw.json
deleted file mode 100644
index 5ac7e18..0000000
--- a/src/main/resources/data/earlygame/recipes/copper_sword_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "tag": "c:copper_ingots"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:copper_sword",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/diamond_knife.json b/src/main/resources/data/earlygame/recipes/diamond_knife.json
index b52bb96..44be930 100755
--- a/src/main/resources/data/earlygame/recipes/diamond_knife.json
+++ b/src/main/resources/data/earlygame/recipes/diamond_knife.json
@@ -9,7 +9,7 @@
             "item": "minecraft:diamond"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/diamond_knife_atbyw.json b/src/main/resources/data/earlygame/recipes/diamond_knife_atbyw.json
deleted file mode 100644
index 631ecbb..0000000
--- a/src/main/resources/data/earlygame/recipes/diamond_knife_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:diamond"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:diamond_knife",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/diamond_saw.json b/src/main/resources/data/earlygame/recipes/diamond_saw.json
index 70ed8c7..e14d4d8 100755
--- a/src/main/resources/data/earlygame/recipes/diamond_saw.json
+++ b/src/main/resources/data/earlygame/recipes/diamond_saw.json
@@ -10,7 +10,7 @@
             "item": "minecraft:diamond"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/diamond_saw_atbyw.json b/src/main/resources/data/earlygame/recipes/diamond_saw_atbyw.json
deleted file mode 100644
index 7fb6e7a..0000000
--- a/src/main/resources/data/earlygame/recipes/diamond_saw_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "  y",
-        " yx",
-        "yx "
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:diamond"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:diamond_saw",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/fire_starter.json b/src/main/resources/data/earlygame/recipes/fire_starter.json
index 0855bd1..7dcef55 100755
--- a/src/main/resources/data/earlygame/recipes/fire_starter.json
+++ b/src/main/resources/data/earlygame/recipes/fire_starter.json
@@ -9,7 +9,7 @@
             "item": "earlygame:lashing"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/fire_starter_atbyw.json b/src/main/resources/data/earlygame/recipes/fire_starter_atbyw.json
deleted file mode 100644
index b3996e9..0000000
--- a/src/main/resources/data/earlygame/recipes/fire_starter_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "xy",
-        "yx"
-    ],
-    "key": {
-        "x": {
-            "item": "earlygame:lashing"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:fire_starter",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/flint_axe.json b/src/main/resources/data/earlygame/recipes/flint_axe.json
index cd274f9..925d1e8 100755
--- a/src/main/resources/data/earlygame/recipes/flint_axe.json
+++ b/src/main/resources/data/earlygame/recipes/flint_axe.json
@@ -12,7 +12,7 @@
             "item": "earlygame:lashing"
         },
         "/": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/flint_axe_atbyw.json b/src/main/resources/data/earlygame/recipes/flint_axe_atbyw.json
deleted file mode 100644
index 54d6e10..0000000
--- a/src/main/resources/data/earlygame/recipes/flint_axe_atbyw.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "#E",
-        " /"
-    ],
-    "key": {
-        "#": {
-            "item": "earlygame:flint_shard"
-        },
-        "E": {
-            "item": "earlygame:lashing"
-        },
-        "/": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:flint_axe",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/flint_knife.json b/src/main/resources/data/earlygame/recipes/flint_knife.json
index 7ea73c7..9a42140 100755
--- a/src/main/resources/data/earlygame/recipes/flint_knife.json
+++ b/src/main/resources/data/earlygame/recipes/flint_knife.json
@@ -9,7 +9,7 @@
             "item": "earlygame:flint_shard"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/flint_knife_atbyw.json b/src/main/resources/data/earlygame/recipes/flint_knife_atbyw.json
deleted file mode 100644
index fa5c008..0000000
--- a/src/main/resources/data/earlygame/recipes/flint_knife_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "item": "earlygame:flint_shard"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:flint_knife",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/flint_pickaxe.json b/src/main/resources/data/earlygame/recipes/flint_pickaxe.json
index 57ba63e..7f48b76 100755
--- a/src/main/resources/data/earlygame/recipes/flint_pickaxe.json
+++ b/src/main/resources/data/earlygame/recipes/flint_pickaxe.json
@@ -13,7 +13,7 @@
             "item": "earlygame:lashing"
         },
         "/": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/flint_pickaxe_atbyw.json b/src/main/resources/data/earlygame/recipes/flint_pickaxe_atbyw.json
deleted file mode 100644
index daa7622..0000000
--- a/src/main/resources/data/earlygame/recipes/flint_pickaxe_atbyw.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "#E#",
-        " / ",
-        " / "
-    ],
-    "key": {
-        "#": {
-            "item": "earlygame:flint_shard"
-        },
-        "E": {
-            "item": "earlygame:lashing"
-        },
-        "/": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:flint_pickaxe",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/flint_saw.json b/src/main/resources/data/earlygame/recipes/flint_saw.json
index a715017..753ba1b 100755
--- a/src/main/resources/data/earlygame/recipes/flint_saw.json
+++ b/src/main/resources/data/earlygame/recipes/flint_saw.json
@@ -10,7 +10,7 @@
             "item": "earlygame:flint_shard"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         },
         "z": {
             "item": "earlygame:lashing"
diff --git a/src/main/resources/data/earlygame/recipes/flint_saw_atbyw.json b/src/main/resources/data/earlygame/recipes/flint_saw_atbyw.json
deleted file mode 100644
index 2d4b21f..0000000
--- a/src/main/resources/data/earlygame/recipes/flint_saw_atbyw.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "  y",
-        " zx",
-        "yx "
-    ],
-    "key": {
-        "x": {
-            "item": "earlygame:flint_shard"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        },
-        "z": {
-            "item": "earlygame:lashing"
-        }
-    },
-    "result": {
-        "item": "earlygame:flint_saw",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/golden_knife.json b/src/main/resources/data/earlygame/recipes/golden_knife.json
index d71fd28..44d9809 100755
--- a/src/main/resources/data/earlygame/recipes/golden_knife.json
+++ b/src/main/resources/data/earlygame/recipes/golden_knife.json
@@ -9,7 +9,7 @@
             "item": "minecraft:gold_ingot"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/golden_knife_atbyw.json b/src/main/resources/data/earlygame/recipes/golden_knife_atbyw.json
deleted file mode 100644
index bcc47a1..0000000
--- a/src/main/resources/data/earlygame/recipes/golden_knife_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:gold_ingot"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:golden_knife",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/golden_saw.json b/src/main/resources/data/earlygame/recipes/golden_saw.json
index 6d32867..886edcd 100755
--- a/src/main/resources/data/earlygame/recipes/golden_saw.json
+++ b/src/main/resources/data/earlygame/recipes/golden_saw.json
@@ -10,7 +10,7 @@
             "item": "minecraft:gold_ingot"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/golden_saw_atbyw.json b/src/main/resources/data/earlygame/recipes/golden_saw_atbyw.json
deleted file mode 100644
index 1ba1641..0000000
--- a/src/main/resources/data/earlygame/recipes/golden_saw_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "  y",
-        " yx",
-        "yx "
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:gold_ingot"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:golden_saw",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/iron_knife.json b/src/main/resources/data/earlygame/recipes/iron_knife.json
index e8a99c1..0d0c933 100755
--- a/src/main/resources/data/earlygame/recipes/iron_knife.json
+++ b/src/main/resources/data/earlygame/recipes/iron_knife.json
@@ -9,7 +9,7 @@
             "item": "minecraft:iron_ingot"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/iron_knife_atbyw.json b/src/main/resources/data/earlygame/recipes/iron_knife_atbyw.json
deleted file mode 100644
index f43935f..0000000
--- a/src/main/resources/data/earlygame/recipes/iron_knife_atbyw.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "x",
-        "y"
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:iron_ingot"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:iron_knife",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/iron_saw.json b/src/main/resources/data/earlygame/recipes/iron_saw.json
index c61570e..f686057 100755
--- a/src/main/resources/data/earlygame/recipes/iron_saw.json
+++ b/src/main/resources/data/earlygame/recipes/iron_saw.json
@@ -10,7 +10,7 @@
             "item": "minecraft:iron_ingot"
         },
         "y": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         }
     },
     "result": {
diff --git a/src/main/resources/data/earlygame/recipes/iron_saw_atbyw.json b/src/main/resources/data/earlygame/recipes/iron_saw_atbyw.json
deleted file mode 100644
index 25b5de0..0000000
--- a/src/main/resources/data/earlygame/recipes/iron_saw_atbyw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "  y",
-        " yx",
-        "yx "
-    ],
-    "key": {
-        "x": {
-            "item": "minecraft:iron_ingot"
-        },
-        "y": {
-            "tag": "atbyw:sticks"
-        }
-    },
-    "result": {
-        "item": "earlygame:iron_saw",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/data/earlygame/recipes/slingshot.json b/src/main/resources/data/earlygame/recipes/slingshot.json
index 1ee2197..3d401e4 100755
--- a/src/main/resources/data/earlygame/recipes/slingshot.json
+++ b/src/main/resources/data/earlygame/recipes/slingshot.json
@@ -7,7 +7,7 @@
     ],
     "key": {
         "x": {
-            "item": "minecraft:stick"
+            "tag": "c:sticks"
         },
         "y": {
             "tag": "minecraft:planks"
diff --git a/src/main/resources/data/earlygame/recipes/slingshot_atbyw.json b/src/main/resources/data/earlygame/recipes/slingshot_atbyw.json
deleted file mode 100644
index 63df8c5..0000000
--- a/src/main/resources/data/earlygame/recipes/slingshot_atbyw.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        "xzx",
-        " y ",
-        " x "
-    ],
-    "key": {
-        "x": {
-            "tag": "atbyw:sticks"
-        },
-        "y": {
-            "tag": "minecraft:planks"
-        },
-        "z": {
-            "item": "earlygame:lashing"
-        }
-    },
-    "result": {
-        "item": "earlygame:slingshot",
-        "count": 1
-    },
-    "group": "atbyw_crafting"
-}
\ No newline at end of file
diff --git a/src/main/resources/earlygame.mixins.json b/src/main/resources/earlygame.mixins.json
index b38cc52..315f31b 100644
--- a/src/main/resources/earlygame.mixins.json
+++ b/src/main/resources/earlygame.mixins.json
@@ -7,9 +7,7 @@
         "BlockMiningMixin",
         "IngredientMixin",
         "MatchingStackAccessor",
-        "RecipeFieldAccessor",
-        "StickTwigGenMixin",
-        "StoneRockGenMixin"
+        "RecipeFieldAccessor"
     ],
     "client": [
     ],
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index bd66869..1d4b50e 100755
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,11 +1,9 @@
 {
     "schemaVersion": 1,
     "id": "earlygame",
+    "version": "1.16.x-1.0.3",
+
     "name": "EarlyGame",
-    "version": "1.16.x-1.0.2",
-    "environment": "*",
-    "license": "MIT",
-    "icon": "assets/earlygame/icon.png",
     "description": "A Fabric mod that focuses on changing early game progression that makes the gameplay feel more \"realistic\".",
     "authors": [
         "JayCeeCreates"
@@ -15,8 +13,11 @@
         "sources": "https://github.com/JayCeeCreates/earlygame.git",
         "issues": "https://github.com/JayCeeCreates/earlygame/issues"
     },
+
+    "license": "MIT",
+    "icon": "assets/earlygame/icon.png",
   
-  
+    "environment": "*",
     "entrypoints": {
         "main": [
             "jayceecreates.earlygame.EarlyGame"
@@ -33,7 +34,7 @@
     ],
   
     "depends": {
-        "fabricloader": ">=0.7.4",
+        "fabricloader": ">=0.11.1",
         "fabric": "*",
         "minecraft": "1.16.x"
     },