diff --git a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java
index a02eb4cd..ec40ed0d 100644
--- a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java
+++ b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java
@@ -32,7 +32,6 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
 import com.google.common.collect.Lists;
 
@@ -60,7 +59,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R
     }
 
     public static Properties baseUnderwaterPlantSettings(Material mat, int light) {
-        Properties props = FabricBlockSettings
+        Properties props = Properties
                 .of(mat)
                 .sound(SoundType.WET_GRASS)
                 .noCollission()
diff --git a/src/main/java/org/betterx/bclib/mixin/common/RegistryAccessMixin.java b/src/main/java/org/betterx/bclib/mixin/common/RegistryAccessMixin.java
index 79b6478e..89316a26 100644
--- a/src/main/java/org/betterx/bclib/mixin/common/RegistryAccessMixin.java
+++ b/src/main/java/org/betterx/bclib/mixin/common/RegistryAccessMixin.java
@@ -20,21 +20,21 @@ import java.util.function.Supplier;
 @Mixin(RegistryAccess.class)
 public interface RegistryAccessMixin {
 
-    @ModifyArg(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;make(Ljava/util/function/Supplier;)Ljava/lang/Object;"))
-    private static Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> together_addRegistry(
-            Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> supplier
-    ) {
-        return () -> {
-            ImmutableMap.Builder<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> builder = ImmutableMap.builder();
-            //Make sure this gets added before WORLD_PRESETS
-            put(builder, BCLBiomeRegistry.BCL_BIOMES_REGISTRY, BiomeData.CODEC);
-
-            Map<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> res = supplier.get();
-            builder.putAll(res);
-
-            return builder.build();
-        };
-    }
+//    @ModifyArg(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;make(Ljava/util/function/Supplier;)Ljava/lang/Object;"))
+//    private static Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> together_addRegistry(
+//            Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> supplier
+//    ) {
+//        return () -> {
+//            ImmutableMap.Builder<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> builder = ImmutableMap.builder();
+//            //Make sure this gets added before WORLD_PRESETS
+//            put(builder, BCLBiomeRegistry.BCL_BIOMES_REGISTRY, BiomeData.CODEC);
+//
+//            Map<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> res = supplier.get();
+//            builder.putAll(res);
+//
+//            return builder.build();
+//        };
+//    }
 
     @Shadow
     static <E> void put(
diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java b/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java
index bd8a2649..1f1587a5 100644
--- a/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java
+++ b/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java
@@ -20,19 +20,19 @@ import java.util.function.Supplier;
 @Mixin(RegistryAccess.class)
 public interface RegistryAccessMixin {
 
-    @ModifyArg(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;make(Ljava/util/function/Supplier;)Ljava/lang/Object;"))
-    private static Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> together_addRegistry(
-            Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> supplier
-    ) {
-        return () -> {
-            Map<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> res = supplier.get();
-            ImmutableMap.Builder<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> builder = ImmutableMap.builder();
-
-            builder.putAll(res);
-            put(builder, SurfaceRuleRegistry.SURFACE_RULES_REGISTRY, AssignedSurfaceRule.CODEC);
-            return builder.build();
-        };
-    }
+//    @ModifyArg(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;make(Ljava/util/function/Supplier;)Ljava/lang/Object;"))
+//    private static Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> together_addRegistry(
+//            Supplier<ImmutableMap<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>>> supplier
+//    ) {
+//        return () -> {
+//            Map<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> res = supplier.get();
+//            ImmutableMap.Builder<ResourceKey<Registry<?>>, RegistryAccess.RegistryData<?>> builder = ImmutableMap.builder();
+//
+//            builder.putAll(res);
+//            put(builder, SurfaceRuleRegistry.SURFACE_RULES_REGISTRY, AssignedSurfaceRule.CODEC);
+//            return builder.build();
+//        };
+//    }
 
     @Shadow
     static <E> void put(