diff --git a/common/src/main/java/dev/architectury/hooks/tags/TagHooks.java b/common/src/main/java/dev/architectury/hooks/tags/TagHooks.java
index cfab7552..48579849 100644
--- a/common/src/main/java/dev/architectury/hooks/tags/TagHooks.java
+++ b/common/src/main/java/dev/architectury/hooks/tags/TagHooks.java
@@ -20,7 +20,6 @@
 package dev.architectury.hooks.tags;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
-import dev.architectury.mixin.FluidTagsAccessor;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.*;
 import net.minecraft.world.entity.EntityType;
@@ -48,7 +47,7 @@ public final class TagHooks {
     }
     
     public static Tag.Named<Fluid> optionalFluid(ResourceLocation id) {
-        return optional(id, FluidTagsAccessor.getHelper()::getAllTags);
+        return optional(id, FluidTags.HELPER::getAllTags);
     }
     
     public static Tag.Named<EntityType<?>> optionalEntityType(ResourceLocation id) {
diff --git a/common/src/main/java/dev/architectury/mixin/FluidTagsAccessor.java b/common/src/main/java/dev/architectury/mixin/FluidTagsAccessor.java
deleted file mode 100644
index c89f8ff2..00000000
--- a/common/src/main/java/dev/architectury/mixin/FluidTagsAccessor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of architectury.
- * Copyright (C) 2020, 2021, 2022 architectury
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-package dev.architectury.mixin;
-
-import net.minecraft.tags.FluidTags;
-import net.minecraft.tags.StaticTagHelper;
-import net.minecraft.world.level.material.Fluid;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(FluidTags.class)
-public interface FluidTagsAccessor {
-    @Accessor("HELPER")
-    static StaticTagHelper<Fluid> getHelper() {
-        throw new AssertionError();
-    }
-}
diff --git a/common/src/main/resources/architectury-common.accessWidener b/common/src/main/resources/architectury-common.accessWidener
index 9f12899b..290f40fc 100644
--- a/common/src/main/resources/architectury-common.accessWidener
+++ b/common/src/main/resources/architectury-common.accessWidener
@@ -44,6 +44,8 @@ accessible field net/minecraft/world/item/ShovelItem FLATTENABLES Ljava/util/Map
 mutable field net/minecraft/world/item/ShovelItem FLATTENABLES Ljava/util/Map;
 accessible field net/minecraft/world/item/HoeItem TILLABLES Ljava/util/Map;
 mutable field net/minecraft/world/item/HoeItem TILLABLES Ljava/util/Map;
+accessible field net/minecraft/tags/FluidTags HELPER Lnet/minecraft/tags/StaticTagHelper;
+mutable field net/minecraft/tags/FluidTags HELPER Lnet/minecraft/tags/StaticTagHelper;
 transitive-accessible field net/minecraft/world/level/Explosion source Lnet/minecraft/world/entity/Entity;
 transitive-mutable field net/minecraft/world/level/Explosion source Lnet/minecraft/world/entity/Entity;
 transitive-accessible field net/minecraft/world/level/Explosion radius F
diff --git a/common/src/main/resources/architectury-common.mixins.json b/common/src/main/resources/architectury-common.mixins.json
index 618fbf85..989561ab 100644
--- a/common/src/main/resources/architectury-common.mixins.json
+++ b/common/src/main/resources/architectury-common.mixins.json
@@ -6,7 +6,6 @@
   "client": [
   ],
   "mixins": [
-    "FluidTagsAccessor",
     "MixinLightningBolt"
   ],
   "injectors": {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 14cc03e5..1db99e56 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -35,7 +35,7 @@
   "accessWidener": "architectury.accessWidener",
   "icon": "icon.png",
   "depends": {
-    "minecraft": "~1.18-",
+    "minecraft": "~1.18- <1.18.2-",
     "fabricloader": ">=0.13.0",
     "fabric": ">=0.44.0"
   },
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index ce97d39e..53e90c4a 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -17,7 +17,7 @@ license = "LGPL-3"
 [[dependencies.architectury]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.18,)"
+versionRange = "[1.18,1.18.2)"
 ordering = "NONE"
 side = "BOTH"
 
diff --git a/gradle.properties b/gradle.properties
index 8a039906..ed356b0b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ archives_base_name_snapshot=architectury-snapshot
 base_version=3.7
 maven_group=dev.architectury
 
-fabric_loader_version=0.12.12
+fabric_loader_version=0.13.3
 fabric_api_version=0.46.2+1.18
 mod_menu_version=3.0.0