diff --git a/.classpath b/.classpath
index 1efc791..be88c88 100644
--- a/.classpath
+++ b/.classpath
@@ -12,11 +12,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/gradle.properties b/gradle.properties
index beeae88..427b7ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.3
+minecraft_version=1.21
+yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.20.6.0
+mod_version=1.21.0.0
 maven_group=de.jottyfan.quickiemod
 archives_base_name=quickiemod
 
 # Dependencies
-fabric_version=0.100.0+1.20.6
\ No newline at end of file
+fabric_version=0.100.0+1.21
\ No newline at end of file
diff --git a/src/main/java/de/jottyfan/quickiemod/init/BlockEntityIdentity.java b/src/main/java/de/jottyfan/quickiemod/init/BlockEntityIdentity.java
index 5875a12..99d22b3 100644
--- a/src/main/java/de/jottyfan/quickiemod/init/BlockEntityIdentity.java
+++ b/src/main/java/de/jottyfan/quickiemod/init/BlockEntityIdentity.java
@@ -9,14 +9,14 @@ import net.minecraft.util.Identifier;
  *
  */
 public class BlockEntityIdentity {
-	public static final Identifier ITEMHOARDER = new Identifier(QuickieMod.MODID, "itemhoarderblockentity");
-	public static final Identifier BLOCKSPREADER = new Identifier(QuickieMod.MODID, "blockspreaderblockentity");
-	public static final Identifier BLOCKSTACKERUP = new Identifier(QuickieMod.MODID, "blockstackerblockentity");
-	public static final Identifier MONSTERHOARDER = new Identifier(QuickieMod.MODID, "monsterhoarderblockentity");
-	public static final Identifier EMPTYLAVALHOARDER = new Identifier(QuickieMod.MODID, "emptylavahoarderblockentity");
-	public static final Identifier DRILL_DOWN = new Identifier(QuickieMod.MODID, "drillblockdownblockentity");
-	public static final Identifier DRILL_EAST = new Identifier(QuickieMod.MODID, "drillblockeastblockentity");
-	public static final Identifier DRILL_SOUTH = new Identifier(QuickieMod.MODID, "drillblocksouthblockentity");
-	public static final Identifier DRILL_WEST = new Identifier(QuickieMod.MODID, "drillblockwestblockentity");
-	public static final Identifier DRILL_NORTH = new Identifier(QuickieMod.MODID, "drillblocknorthblockentity");
+	public static final Identifier ITEMHOARDER = Identifier.of(QuickieMod.MODID, "itemhoarderblockentity");
+	public static final Identifier BLOCKSPREADER = Identifier.of(QuickieMod.MODID, "blockspreaderblockentity");
+	public static final Identifier BLOCKSTACKERUP = Identifier.of(QuickieMod.MODID, "blockstackerblockentity");
+	public static final Identifier MONSTERHOARDER = Identifier.of(QuickieMod.MODID, "monsterhoarderblockentity");
+	public static final Identifier EMPTYLAVALHOARDER = Identifier.of(QuickieMod.MODID, "emptylavahoarderblockentity");
+	public static final Identifier DRILL_DOWN = Identifier.of(QuickieMod.MODID, "drillblockdownblockentity");
+	public static final Identifier DRILL_EAST = Identifier.of(QuickieMod.MODID, "drillblockeastblockentity");
+	public static final Identifier DRILL_SOUTH = Identifier.of(QuickieMod.MODID, "drillblocksouthblockentity");
+	public static final Identifier DRILL_WEST = Identifier.of(QuickieMod.MODID, "drillblockwestblockentity");
+	public static final Identifier DRILL_NORTH = Identifier.of(QuickieMod.MODID, "drillblocknorthblockentity");
 }
diff --git a/src/main/java/de/jottyfan/quickiemod/init/FeaturesManager.java b/src/main/java/de/jottyfan/quickiemod/init/FeaturesManager.java
index f355d0a..234881b 100644
--- a/src/main/java/de/jottyfan/quickiemod/init/FeaturesManager.java
+++ b/src/main/java/de/jottyfan/quickiemod/init/FeaturesManager.java
@@ -38,11 +38,11 @@ public class FeaturesManager {
   public static final RegistryKey<PlacedFeature> PF_ORESANDSALPETER  = genPf("oresandsalpeter");
 
   private static final RegistryKey<ConfiguredFeature<?, ?>> genCf(String name) {
-  	return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(QuickieMod.MODID, name));
+  	return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(QuickieMod.MODID, name));
   }
 
 	private static final RegistryKey<PlacedFeature> genPf(String name) {
-  	return RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier(QuickieMod.MODID, name));
+  	return RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(QuickieMod.MODID, name));
   }
 
 	protected static final BiConsumer<BiomeSelectionContext, BiomeModificationContext> overworldOres() {
diff --git a/src/main/java/de/jottyfan/quickiemod/init/RegistryManager.java b/src/main/java/de/jottyfan/quickiemod/init/RegistryManager.java
index 3d06d22..630455a 100644
--- a/src/main/java/de/jottyfan/quickiemod/init/RegistryManager.java
+++ b/src/main/java/de/jottyfan/quickiemod/init/RegistryManager.java
@@ -32,7 +32,7 @@ public class RegistryManager {
 	private static final Logger LOGGER = LoggerFactory.getLogger(QuickieMod.MODID);
 
 	public static final void registerItemGroup() {
-		Registry.register(Registries.ITEM_GROUP, RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier(QuickieMod.MODID, "itemgroups")),
+		Registry.register(Registries.ITEM_GROUP, RegistryKey.of(RegistryKeys.ITEM_GROUP, Identifier.of(QuickieMod.MODID, "itemgroups")),
 				FabricItemGroup.builder().icon(() -> new ItemStack(QuickieItems.ROTTEN_FLESH_STRIPES.getItem())).displayName(Text.literal(QuickieMod.MODID))
 						.entries((enabledFeatures, stacks) -> {
 							for (QuickieItems i : QuickieItems.values()) {
@@ -49,7 +49,7 @@ public class RegistryManager {
 	public static final void registerItems() {
 		LOGGER.debug("registering items");
 		for (QuickieItems i : QuickieItems.values()) {
-			Registry.register(Registries.ITEM, new Identifier(QuickieMod.MODID, i.getName()), i.getItem());
+			Registry.register(Registries.ITEM, Identifier.of(QuickieMod.MODID, i.getName()), i.getItem());
 		}
 		ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTONSEED.getItem(), 0.5f);
 		ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTON.getItem(), 0.75f);
@@ -62,18 +62,18 @@ public class RegistryManager {
 	public static final void registerBlocks() {
 		LOGGER.debug("registering blocks");
 		for (QuickieBlocks b : QuickieBlocks.values()) {
-			Registry.register(Registries.BLOCK, new Identifier(QuickieMod.MODID, b.getName()), b.getBlock());
-			Registry.register(Registries.ITEM, new Identifier(QuickieMod.MODID, b.getName()), new BlockItem(b.getBlock(), new Settings()));
+			Registry.register(Registries.BLOCK, Identifier.of(QuickieMod.MODID, b.getName()), b.getBlock());
+			Registry.register(Registries.ITEM, Identifier.of(QuickieMod.MODID, b.getName()), new BlockItem(b.getBlock(), new Settings()));
 		}
 	}
 
 	public static final void registerFeatures() {
 		// Overworld features
-		BiomeModifications.create(new Identifier(QuickieMod.MODID, "features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInOverworld(),
+		BiomeModifications.create(Identifier.of(QuickieMod.MODID, "features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInOverworld(),
 				FeaturesManager.overworldOres());
 
 		// Nether features
-		BiomeModifications.create(new Identifier(QuickieMod.MODID, "nether_features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInTheNether(),
+		BiomeModifications.create(Identifier.of(QuickieMod.MODID, "nether_features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInTheNether(),
 				FeaturesManager.netherOres());
 	}
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 42f9ac7..4d82238 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,7 +27,7 @@
 	},
 	"depends": {
 		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.20.6",
+		"minecraft": "~1.21",
 		"java": ">=21",
 		"fabric-api": "*"
 	},