diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..4fdf414
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,90 @@
+name: Build
+
+on:
+  push:
+    tags:
+      - "v*"
+    branches:
+      - "**"
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      loader:
+        description: Mod loader to build and publish
+        required: true
+        default: both
+        type: choice
+        options:
+          - both
+          - fabric
+          - neoforge
+      release_type:
+        description: CurseForge release channel
+        required: true
+        default: alpha
+        type: choice
+        options:
+          - alpha
+          - beta
+          - release
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "21"
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Make Gradle wrapper executable
+        run: chmod +x ./gradlew
+
+      - name: Build Fabric
+        if: github.event_name != 'workflow_dispatch' || inputs.loader == 'both' || inputs.loader == 'fabric'
+        run: ./gradlew :fabric:build
+
+      - name: Build NeoForge
+        if: github.event_name != 'workflow_dispatch' || inputs.loader == 'both' || inputs.loader == 'neoforge'
+        run: ./gradlew :neoforge:build
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: openfm-${{ github.ref_name }}
+          path: |
+            fabric/build/libs/*.jar
+            neoforge/build/libs/*.jar
+            !fabric/build/libs/*-sources.jar
+            !neoforge/build/libs/*-sources.jar
+          if-no-files-found: error
+
+      - name: Publish Fabric to CurseForge
+        if: (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch') && (github.event_name != 'workflow_dispatch' || inputs.loader == 'both' || inputs.loader == 'fabric')
+        env:
+          ORG_GRADLE_PROJECT_curseforge_project: ${{ vars.CURSEFORGE_PROJECT_ID }}
+          ORG_GRADLE_PROJECT_curseforge_token: ${{ secrets.CURSEFORGE_TOKEN }}
+          ORG_GRADLE_PROJECT_curseforge_release_type: ${{ github.event_name == 'workflow_dispatch' && inputs.release_type || 'release' }}
+          ORG_GRADLE_PROJECT_curseforge_changelog: OpenFM ${{ github.ref_name }} from ${{ github.sha }}
+        run: ./gradlew :fabric:publishCurseForge --no-configuration-cache
+
+      - name: Publish NeoForge to CurseForge
+        if: (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch') && (github.event_name != 'workflow_dispatch' || inputs.loader == 'both' || inputs.loader == 'neoforge')
+        env:
+          ORG_GRADLE_PROJECT_curseforge_project: ${{ vars.CURSEFORGE_PROJECT_ID }}
+          ORG_GRADLE_PROJECT_curseforge_token: ${{ secrets.CURSEFORGE_TOKEN }}
+          ORG_GRADLE_PROJECT_curseforge_release_type: ${{ github.event_name == 'workflow_dispatch' && inputs.release_type || 'release' }}
+          ORG_GRADLE_PROJECT_curseforge_changelog: OpenFM ${{ github.ref_name }} from ${{ github.sha }}
+        run: ./gradlew :neoforge:publishCurseForge --no-configuration-cache
diff --git a/.gitignore b/.gitignore
index 12f8644..9746858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ build
 # other
 eclipse
 run
+runs
 
 # Files from Forge MDK
 forge*changelog.txt
diff --git a/README.md b/README.md
index 09c8940..c02b03f 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,43 @@
 # OpenFM
 
-Streaming radio for Minecraft, with OpenComputers, and ComputerCraft support.
+OpenFM adds streaming internet radio blocks and linked speakers to Minecraft 1.21.1, with optional CC:Tweaked peripheral support.
 
-fm = component.openfm_radio
+## Loaders
 
-fm.setURL("http://listen.radionomy.com/DeepHouse")
+OpenFM is maintained as a multi-loader project:
 
-fm.start()
+- `common` contains shared gameplay, networking payloads, UI, rendering, and streaming audio code.
+- `neoforge` contains the NeoForge entrypoint and loader integrations.
+- `fabric` contains the Fabric entrypoints and loader integrations.
 
-fm.stop()
+The loader modules compile the same common sources. Loader-specific behavior is kept behind the registration and platform service interfaces under `me.michiyo.openfm.platform`.
 
-fm.volUp()
+## Building
 
-fm.volDown()
+Java 21 is required.
 
-fm.getVol()
+```powershell
+.\gradlew.bat :neoforge:build :fabric:build
+```
 
-fm.setScreenColor(0xFF0000) Sets the text color to red on the display
+The distributable JARs are written to:
 
-fm.setScreenText("Text to display on radio")  Text will scroll if larger than the display.
+- `neoforge/build/libs/openfm-neoforge-1.21.1-<version>.jar`
+- `fabric/build/libs/openfm-fabric-1.21.1-<version>.jar`
 
+Both JARs embed the MP3, Ogg Vorbis, and AAC decoder libraries. The Fabric build requires Fabric API. CC:Tweaked is optional on both loaders.
 
-Highly modified version of Dragon's Radio Mod, Dragon's Radio Mod is Licenses MIT.
+## Development runs
 
-Downloads via Curse http://www.curse.com/mc-mods/Minecraft/236839-openfm
+```powershell
+.\gradlew.bat :neoforge:runClient
+.\gradlew.bat :neoforge:runServer
+.\gradlew.bat :fabric:runClient
+.\gradlew.bat :fabric:runServer
+```
+
+## CC:Tweaked
+
+When CC:Tweaked is installed, the radio is exposed as an OpenFM peripheral. Existing Lua-facing methods and events are shared between both loader builds.
+
+OpenFM is a heavily modified version of Dragon's Radio Mod. Both projects are licensed under the MIT License.
diff --git a/build.gradle b/build.gradle
index ec6d80a..a917db6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,69 +1,11 @@
 plugins {
-    id 'eclipse'
-    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '6.0.+'
+    id 'fabric-loom' version '1.8-SNAPSHOT' apply false
+    id 'net.neoforged.moddev' version '2.0.49-beta' apply false
+    id 'net.darkhax.curseforgegradle' version '1.1.28' apply false
 }
 
-group = project.mod_group
-version = project.mod_version
-archivesBaseName = project.mod_id
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-
-minecraft {
-    mappings channel: 'official', version: project.minecraft_version
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.console.level', 'debug'
-            mods {
-                "${project.mod_id}" {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.console.level', 'debug'
-            mods {
-                "${project.mod_id}" {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-repositories {
-    mavenCentral()
-
-    // CC:Tweaked Maven (note: maven.squiddev.cc, NOT squiddev.cc/maven)
-    maven {
-        url "https://maven.squiddev.cc"
-        content { includeGroup "cc.tweaked" }
-    }
-}
-
-dependencies {
-    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
-
-    // Compile-time
-    implementation "javazoom:jlayer:1.0.1"
-    implementation "org.jcraft:jorbis:0.0.17"
-
-    // ComputerCraft (CC:Tweaked) - ForgeGradle deobf deps
-    // API at compile-time, full mod at runtime for dev runs.
-    compileOnly "cc.tweaked:cc-tweaked-1.20.1-core-api:1.117.0"
-    compileOnly fg.deobf("cc.tweaked:cc-tweaked-1.20.1-forge-api:1.117.0")
-    runtimeOnly fg.deobf("cc.tweaked:cc-tweaked-1.20.1-forge:1.117.0")
-
-    // DEV runtime: put libs on the game/launch classpath so the mod classloader can see them
-    minecraftLibrary "javazoom:jlayer:1.0.1"
-    minecraftLibrary "org.jcraft:jorbis:0.0.17"
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
+tasks.register('publishCurseForge') {
+    group = 'publishing'
+    description = 'Build and publish both the Fabric and NeoForge JARs to CurseForge.'
+    dependsOn(':fabric:publishCurseForge', ':neoforge:publishCurseForge')
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000..afdd0b1
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle
new file mode 100644
index 0000000..2798bc1
--- /dev/null
+++ b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -0,0 +1,77 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+}
+
+base {
+    archivesName = "${mod_id}-${project.name}-${minecraft_version}"
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(java_version)
+    withSourcesJar()
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        name = 'CC-Tweaked'
+        url = 'https://maven.squiddev.cc'
+        content { includeGroup 'cc.tweaked' }
+    }
+    exclusiveContent {
+        forRepositories(
+                maven {
+                    name = 'ParchmentMC'
+                    url = 'https://maven.parchmentmc.org/'
+                },
+                maven {
+                    name = 'NeoForge'
+                    url = 'https://maven.neoforged.net/releases'
+                }
+        )
+        filter { includeGroup 'org.parchmentmc.data' }
+    }
+}
+
+['apiElements', 'runtimeElements', 'sourcesElements'].each { variant ->
+    configurations."$variant".outgoing {
+        capability("$group:${base.archivesName.get()}:$version")
+        capability("$group:$mod_id-${project.name}-${minecraft_version}:$version")
+        capability("$group:$mod_id:$version")
+    }
+    publishing.publications.configureEach {
+        suppressPomMetadataWarningsFor(variant)
+    }
+}
+
+tasks.withType(Jar).configureEach {
+    from(rootProject.file('LICENSE')) {
+        rename { "${it}_${mod_name}" }
+    }
+}
+
+processResources {
+    def expandProps = [
+            version: version,
+            minecraft_version: minecraft_version,
+            minecraft_version_range: minecraft_version_range,
+            fabric_version: fabric_version,
+            fabric_loader_version: fabric_loader_version,
+            mod_name: mod_name,
+            mod_author: mod_author,
+            mod_id: mod_id,
+            license: license,
+            description: project.description,
+            neoforge_version: neoforge_version,
+            neoforge_loader_version_range: neoforge_loader_version_range,
+            cc_tweaked_version: cc_tweaked_version,
+            cc_tweaked_min_version: cc_tweaked_min_version,
+            credits: credits,
+            java_version: java_version
+    ]
+    filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml']) {
+        expand expandProps
+    }
+    inputs.properties(expandProps)
+}
diff --git a/buildSrc/src/main/groovy/multiloader-loader.gradle b/buildSrc/src/main/groovy/multiloader-loader.gradle
new file mode 100644
index 0000000..467b08c
--- /dev/null
+++ b/buildSrc/src/main/groovy/multiloader-loader.gradle
@@ -0,0 +1,34 @@
+plugins {
+    id 'multiloader-common'
+}
+
+configurations {
+    commonJava { canBeResolved = true }
+    commonResources { canBeResolved = true }
+}
+
+dependencies {
+    compileOnly(project(':common')) {
+        capabilities { requireCapability "$group:$mod_id" }
+    }
+    commonJava project(path: ':common', configuration: 'commonJava')
+    commonResources project(path: ':common', configuration: 'commonResources')
+}
+
+tasks.named('compileJava', JavaCompile) {
+    dependsOn(configurations.commonJava)
+    source(configurations.commonJava)
+}
+
+processResources {
+    dependsOn(configurations.commonResources)
+    from(configurations.commonResources)
+}
+
+tasks.named('sourcesJar', Jar) {
+    dependsOn(configurations.commonJava)
+    from(configurations.commonJava)
+    dependsOn(configurations.commonResources)
+    from(configurations.commonResources)
+}
+
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 0000000..a8af6aa
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    id 'multiloader-common'
+    id 'net.neoforged.moddev'
+}
+
+neoForge {
+    neoFormVersion = neo_form_version
+    parchment {
+        minecraftVersion = parchment_minecraft
+        mappingsVersion = parchment_version
+    }
+}
+
+dependencies {
+    api 'javazoom:jlayer:1.0.1'
+    api 'org.jcraft:jorbis:0.0.17'
+    api 'com.tianscar.javasound:jaad:0.9.4'
+    compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-core-api:${cc_tweaked_neoforge_version}"
+}
+
+configurations {
+    commonJava {
+        canBeResolved = false
+        canBeConsumed = true
+    }
+    commonResources {
+        canBeResolved = false
+        canBeConsumed = true
+    }
+}
+
+artifacts {
+    commonJava sourceSets.main.java.sourceDirectories.singleFile
+    commonResources sourceSets.main.resources.sourceDirectories.singleFile
+}
diff --git a/src/main/java/me/michiyo/openfm.zip b/common/src/main/java/me/michiyo/openfm.zip
similarity index 100%
rename from src/main/java/me/michiyo/openfm.zip
rename to common/src/main/java/me/michiyo/openfm.zip
diff --git a/common/src/main/java/me/michiyo/openfm/OpenFM.java b/common/src/main/java/me/michiyo/openfm/OpenFM.java
new file mode 100644
index 0000000..87c9697
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/OpenFM.java
@@ -0,0 +1,27 @@
+package me.michiyo.openfm;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.reg.ModBlockEntities;
+import me.michiyo.openfm.reg.ModBlocks;
+import me.michiyo.openfm.reg.ModCreativeTabs;
+import me.michiyo.openfm.reg.ModItems;
+import me.michiyo.openfm.reg.ModMenus;
+
+public final class OpenFM {
+    public static final String MODID = "openfm";
+    private static boolean initialized;
+
+    public static synchronized void init(OpenFMRegistrar registrar) {
+        if (initialized) return;
+
+        ModBlocks.register(registrar);
+        ModItems.register(registrar);
+        ModBlockEntities.register(registrar);
+        ModMenus.register(registrar);
+        ModCreativeTabs.register(registrar);
+        initialized = true;
+    }
+
+    private OpenFM() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/client/ClientEvents.java b/common/src/main/java/me/michiyo/openfm/client/ClientEvents.java
new file mode 100644
index 0000000..521dc7e
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/client/ClientEvents.java
@@ -0,0 +1,12 @@
+package me.michiyo.openfm.client;
+
+import me.michiyo.openfm.client.audio.RadioStreamManager;
+
+public final class ClientEvents {
+    public static void clientTick() {
+        RadioStreamManager.clientTick();
+    }
+
+    private ClientEvents() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/client/OpenFMClient.java b/common/src/main/java/me/michiyo/openfm/client/OpenFMClient.java
new file mode 100644
index 0000000..1b2d2be
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/client/OpenFMClient.java
@@ -0,0 +1,27 @@
+package me.michiyo.openfm.client;
+
+import me.michiyo.openfm.client.screen.OpenFMAudioSettingsScreen;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.options.OptionsScreen;
+import net.minecraft.network.chat.Component;
+
+import java.util.function.Consumer;
+
+public final class OpenFMClient {
+    public static void addSettingsButton(Screen screen, Consumer<Button> addButton) {
+        if (!(screen instanceof OptionsScreen optionsScreen)) return;
+
+        int x = screen.width / 2 - 155;
+        int y = screen.height - 27;
+        Button button = Button.builder(Component.literal("OpenFM Audio..."), ignored ->
+                Minecraft.getInstance().setScreen(new OpenFMAudioSettingsScreen(optionsScreen)))
+                .bounds(x, y, 150, 20)
+                .build();
+        addButton.accept(button);
+    }
+
+    private OpenFMClient() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/client/audio/AacDecoder.java b/common/src/main/java/me/michiyo/openfm/client/audio/AacDecoder.java
new file mode 100644
index 0000000..b987a95
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/client/audio/AacDecoder.java
@@ -0,0 +1,74 @@
+package me.michiyo.openfm.client.audio;
+
+import net.sourceforge.jaad.SampleBuffer;
+import net.sourceforge.jaad.aac.Decoder;
+import net.sourceforge.jaad.adts.ADTSDemultiplexer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+public final class AacDecoder implements PcmDecoder {
+    private final InputStream in;
+    private final ADTSDemultiplexer demultiplexer;
+    private final Decoder decoder;
+    private final SampleBuffer sampleBuffer = new SampleBuffer();
+
+    private int sampleRate;
+    private int channels;
+    private byte[] pending = new byte[0];
+    private int pendingOffset;
+
+    public AacDecoder(InputStream in) throws IOException {
+        this.in = in;
+        this.demultiplexer = new ADTSDemultiplexer(in);
+        this.decoder = Decoder.create(demultiplexer.getDecoderInfo());
+        this.sampleBuffer.setBigEndian(false);
+        this.sampleRate = demultiplexer.getSampleFrequency();
+        this.channels = demultiplexer.getChannelCount();
+    }
+
+    @Override
+    public byte[] readPcmChunk(int requestedBytes) throws Exception {
+        byte[] out = new byte[requestedBytes];
+        int written = 0;
+
+        while (written < requestedBytes) {
+            if (pendingOffset < pending.length) {
+                int count = Math.min(pending.length - pendingOffset, requestedBytes - written);
+                System.arraycopy(pending, pendingOffset, out, written, count);
+                pendingOffset += count;
+                written += count;
+                continue;
+            }
+
+            byte[] frame = demultiplexer.readNextFrame();
+            if (frame == null) {
+                return written == 0 ? null : Arrays.copyOf(out, written);
+            }
+
+            decoder.decodeFrame(frame, sampleBuffer);
+            sampleRate = sampleBuffer.getSampleRate();
+            channels = sampleBuffer.getChannels();
+            pending = sampleBuffer.getData();
+            pendingOffset = 0;
+        }
+
+        return out;
+    }
+
+    @Override
+    public int getSampleRate() {
+        return sampleRate;
+    }
+
+    @Override
+    public int getChannels() {
+        return channels;
+    }
+
+    @Override
+    public void close() {
+        try { in.close(); } catch (IOException ignored) {}
+    }
+}
diff --git a/src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java b/common/src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java
similarity index 79%
rename from src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java
index 588ee05..8b46577 100644
--- a/src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java
+++ b/common/src/main/java/me/michiyo/openfm/client/audio/DecoderFactory.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
+import java.util.Locale;
 
 public final class DecoderFactory {
     private DecoderFactory() {}
@@ -17,7 +18,7 @@ public DecoderWithStream(PcmDecoder decoder, InputStream stream) {
         }
     }
 
-    public static DecoderWithStream create(InputStream raw) throws Exception {
+    public static DecoderWithStream create(InputStream raw, String contentType) throws Exception {
         PushbackInputStream in = new PushbackInputStream(raw, 64);
 
         byte[] head = readSome(in, 64);
@@ -30,6 +31,11 @@ public static DecoderWithStream create(InputStream raw) throws Exception {
             return new DecoderWithStream(new OggVorbisDecoder(in), in);
         }
 
+        String normalizedType = contentType == null ? "" : contentType.toLowerCase(Locale.ROOT);
+        if (normalizedType.contains("aac") || isAdts(head)) {
+            return new DecoderWithStream(new AacDecoder(in), in);
+        }
+
         // MP3 often starts with ID3 tag
         if (startsWith(head, new byte[]{'I','D','3'})) {
             return new DecoderWithStream(new Mp3Decoder(in), in);
@@ -48,6 +54,12 @@ public static DecoderWithStream create(InputStream raw) throws Exception {
         return new DecoderWithStream(new Mp3Decoder(in), in);
     }
 
+    private static boolean isAdts(byte[] head) {
+        return head.length >= 2
+                && (head[0] & 0xFF) == 0xFF
+                && (head[1] & 0xF6) == 0xF0;
+    }
+
     private static boolean startsWith(byte[] a, byte[] prefix) {
         if (a.length < prefix.length) return false;
         for (int i = 0; i < prefix.length; i++) {
diff --git a/common/src/main/java/me/michiyo/openfm/client/audio/M3uPlaylist.java b/common/src/main/java/me/michiyo/openfm/client/audio/M3uPlaylist.java
new file mode 100644
index 0000000..133bd86
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/client/audio/M3uPlaylist.java
@@ -0,0 +1,54 @@
+package me.michiyo.openfm.client.audio;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Optional;
+
+final class M3uPlaylist {
+    static final int MAX_BYTES = 64 * 1024;
+
+    private M3uPlaylist() {}
+
+    static boolean isPlaylist(URI uri, String contentType) {
+        String type = contentType == null ? "" : contentType.toLowerCase(Locale.ROOT);
+        int parameter = type.indexOf(';');
+        if (parameter >= 0) {
+            type = type.substring(0, parameter).trim();
+        }
+
+        if (type.equals("audio/x-mpegurl")
+                || type.equals("audio/mpegurl")
+                || type.equals("application/x-mpegurl")
+                || type.equals("application/mpegurl")) {
+            return true;
+        }
+
+        String path = uri.getPath();
+        return path != null && path.toLowerCase(Locale.ROOT).endsWith(".m3u");
+    }
+
+    static Optional<URI> firstHttpEntry(URI playlistUri, byte[] contents) {
+        String playlist = new String(contents, StandardCharsets.UTF_8);
+        if (!playlist.isEmpty() && playlist.charAt(0) == '\uFEFF') {
+            playlist = playlist.substring(1);
+        }
+
+        for (String line : playlist.split("\\R")) {
+            String entry = line.trim();
+            if (entry.isEmpty() || entry.startsWith("#")) continue;
+
+            try {
+                URI resolved = playlistUri.resolve(entry);
+                String scheme = resolved.getScheme();
+                if (scheme != null && (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"))) {
+                    return Optional.of(resolved);
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Try the next entry in a malformed or mixed playlist.
+            }
+        }
+
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/me/michiyo/openfm/client/audio/Mp3Decoder.java b/common/src/main/java/me/michiyo/openfm/client/audio/Mp3Decoder.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/client/audio/Mp3Decoder.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/Mp3Decoder.java
diff --git a/src/main/java/me/michiyo/openfm/client/audio/OggVorbisDecoder.java b/common/src/main/java/me/michiyo/openfm/client/audio/OggVorbisDecoder.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/client/audio/OggVorbisDecoder.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/OggVorbisDecoder.java
diff --git a/src/main/java/me/michiyo/openfm/client/audio/PcmDecoder.java b/common/src/main/java/me/michiyo/openfm/client/audio/PcmDecoder.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/client/audio/PcmDecoder.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/PcmDecoder.java
diff --git a/src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java b/common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java
similarity index 92%
rename from src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java
index 69397cb..007086d 100644
--- a/src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java
+++ b/common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamManager.java
@@ -113,12 +113,12 @@ public static void clientTick() {
             BlockPos pos = e.getKey();
             Desired d = e.getValue();
 
-            // If chunk not loaded, stop and forget desired state
-            if (!mc.level.hasChunkAt(pos)) {
+            // A loaded speaker can keep playback alive even when the radio's own chunk is not loaded.
+            if (!mc.level.hasChunkAt(pos) && !hasLoadedEmitter(mc.level, pos)) {
                 stopPlayer(pos);
                 it.remove();
                 NOW_PLAYING.remove(pos);
-                clearAllEmittersForRadio(pos); // keep this
+                clearAllEmittersForRadio(pos);
                 continue;
             }
 
@@ -133,12 +133,13 @@ public static void clientTick() {
             }
 
             // Pick nearest emitter for this radio (radio itself is always an implicit emitter)
+            boolean radioLoaded = mc.level.hasChunkAt(pos);
             Vec3 targetPos = blockCenter(pos);
 
             Map<BlockPos, Vec3> emitters = RADIO_EMITTERS.get(pos);
             if (emitters != null && !emitters.isEmpty()) {
-                double bestDist2 = targetPos.distanceToSqr(listener);
-                Vec3 bestPos = targetPos;
+                double bestDist2 = radioLoaded ? targetPos.distanceToSqr(listener) : Double.POSITIVE_INFINITY;
+                Vec3 bestPos = radioLoaded ? targetPos : null;
                 //System.out.println("[OpenFM][EmitterPick] radio=" + pos + " usingEmitter=" + (targetPos == null ? "null" : targetPos));
 
                 for (var ee : emitters.entrySet()) {
@@ -160,7 +161,9 @@ public static void clientTick() {
                     }
                 }
 
-                targetPos = bestPos;
+                if (bestPos != null) {
+                    targetPos = bestPos;
+                }
 
                 if (emitters.isEmpty()) {
                     RADIO_EMITTERS.remove(pos);
@@ -277,6 +280,12 @@ private static Vec3 blockCenter(BlockPos pos) {
         return new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
     }
 
+    private static boolean hasLoadedEmitter(Level level, BlockPos radioPos) {
+        Map<BlockPos, Vec3> emitters = RADIO_EMITTERS.get(radioPos);
+        if (emitters == null || emitters.isEmpty()) return false;
+        return emitters.keySet().stream().anyMatch(level::hasChunkAt);
+    }
+
     private static Vec3 lerp(Vec3 a, Vec3 b, double t) {
         return new Vec3(
                 a.x + (b.x - a.x) * t,
diff --git a/src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java b/common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java
similarity index 89%
rename from src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java
rename to common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java
index ab8fa53..92a72b7 100644
--- a/src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java
+++ b/common/src/main/java/me/michiyo/openfm/client/audio/RadioStreamPlayer.java
@@ -26,6 +26,8 @@
 public final class RadioStreamPlayer {
     private static final boolean DEBUG = true;
 
+    private static final int MAX_PLAYLIST_DEPTH = 5;
+
     private static final int BUFFER_MS = 400;
     private static final int NUM_AL_BUFFERS = 6;
 
@@ -356,20 +358,12 @@ private void startDecoderThread() {
             PcmDecoder decoder = null;
 
             try {
-                log("HTTP GET " + url);
-
-                HttpRequest req = HttpRequest.newBuilder()
-                        .uri(URI.create(url))
-                        .GET()
-                        .header("User-Agent", "OpenFM")
-                        .header("Icy-MetaData", "1") // request ICY metadata if available
-                        .build();
-
-                HttpResponse<InputStream> resp = client.send(req, HttpResponse.BodyHandlers.ofInputStream());
-                log("HTTP status=" + resp.statusCode());
-                if (resp.statusCode() < 200 || resp.statusCode() >= 300) return;
+                HttpResponse<InputStream> resp = openAudioResponse(client, URI.create(url));
+                if (resp == null) return;
 
                 int metaInt = parseIcyMetaInt(resp.headers().firstValue("icy-metaint"));
+                String contentType = resp.headers().firstValue("content-type").orElse("");
+                log("Content-Type=" + contentType);
 
                 try (InputStream raw = resp.body();
                      BufferedInputStream bin0 = new BufferedInputStream(raw, 64 * 1024)) {
@@ -399,7 +393,7 @@ private void startDecoderThread() {
                         audioIn = new BufferedInputStream(audioIn, 64 * 1024);
                     }
 
-                    DecoderFactory.DecoderWithStream created = DecoderFactory.create(audioIn);
+                    DecoderFactory.DecoderWithStream created = DecoderFactory.create(audioIn, contentType);
                     decoder = created.decoder;
 
                     log("Decoder=" + decoder.getClass().getSimpleName());
@@ -452,12 +446,19 @@ private void startDecoderThread() {
                     Thread.currentThread().interrupt();
                 }
             } catch (Throwable t) {
-                log("Decoder thread exception: " + t);
-                t.printStackTrace();
+                if (stopped.get() || !running.get()) {
+                    Thread.currentThread().interrupt();
+                } else {
+                    log("Decoder thread exception: " + t);
+                    t.printStackTrace();
+                }
             } finally {
                 if (decoder != null) {
                     try { decoder.close(); } catch (Throwable ignored) {}
                 }
+                if (!stopped.get()) {
+                    stopInternal();
+                }
             }
         }, "OpenFM-Decode-" + url.hashCode());
 
@@ -465,6 +466,56 @@ private void startDecoderThread() {
         decodeThread.start();
     }
 
+    private static HttpResponse<InputStream> openAudioResponse(HttpClient client, URI initialUri) throws Exception {
+        URI currentUri = initialUri;
+
+        for (int depth = 0; depth <= MAX_PLAYLIST_DEPTH; depth++) {
+            log("HTTP GET " + currentUri);
+
+            HttpRequest req = HttpRequest.newBuilder()
+                    .uri(currentUri)
+                    .GET()
+                    .header("User-Agent", "OpenFM")
+                    .header("Icy-MetaData", "1")
+                    .build();
+
+            HttpResponse<InputStream> resp = client.send(req, HttpResponse.BodyHandlers.ofInputStream());
+            log("HTTP status=" + resp.statusCode());
+            if (resp.statusCode() < 200 || resp.statusCode() >= 300) {
+                resp.body().close();
+                return null;
+            }
+
+            String contentType = resp.headers().firstValue("content-type").orElse("");
+            if (!M3uPlaylist.isPlaylist(currentUri, contentType)) {
+                return resp;
+            }
+
+            byte[] contents;
+            try (InputStream body = resp.body()) {
+                contents = body.readNBytes(M3uPlaylist.MAX_BYTES + 1);
+            }
+
+            if (contents.length > M3uPlaylist.MAX_BYTES) {
+                log("M3U playlist exceeds " + M3uPlaylist.MAX_BYTES + " bytes.");
+                return null;
+            }
+
+            Optional<URI> entry = M3uPlaylist.firstHttpEntry(currentUri, contents);
+            if (entry.isEmpty()) {
+                log("M3U playlist contains no HTTP stream URL.");
+                return null;
+            }
+
+            URI nextUri = entry.get();
+            log("M3U resolved to " + nextUri);
+            currentUri = nextUri;
+        }
+
+        log("M3U playlist nesting exceeds " + MAX_PLAYLIST_DEPTH + ".");
+        return null;
+    }
+
     private static int parseIcyMetaInt(Optional<String> v) {
         if (v.isEmpty()) return 0;
         try {
diff --git a/src/main/java/me/michiyo/openfm/client/gui/TexturedButton.java b/common/src/main/java/me/michiyo/openfm/client/gui/TexturedButton.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/client/gui/TexturedButton.java
rename to common/src/main/java/me/michiyo/openfm/client/gui/TexturedButton.java
diff --git a/src/main/java/me/michiyo/openfm/client/render/RadioBlockEntityRenderer.java b/common/src/main/java/me/michiyo/openfm/client/render/RadioBlockEntityRenderer.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/client/render/RadioBlockEntityRenderer.java
rename to common/src/main/java/me/michiyo/openfm/client/render/RadioBlockEntityRenderer.java
diff --git a/src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java b/common/src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java
similarity index 90%
rename from src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java
rename to common/src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java
index 0c47e37..4beb12e 100644
--- a/src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java
+++ b/common/src/main/java/me/michiyo/openfm/client/screen/OpenFMAudioSettingsScreen.java
@@ -5,15 +5,12 @@
 import net.minecraft.client.OptionInstance;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.OptionsList;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 
 public class OpenFMAudioSettingsScreen extends Screen {
 
     private final Screen parent;
-    private OptionsList list;
-
     // Updates continuously while dragging; written to config on mouse release / Done.
     private double pendingRadioVolume;
 
@@ -42,9 +39,9 @@ public OpenFMAudioSettingsScreen(Screen parent) {
 
     @Override
     protected void init() {
-        this.list = new OptionsList(this.minecraft, this.width, this.height, 32, this.height - 32, 25);
-        this.list.addBig(this.radioVolumeOption);
-        this.addWidget(this.list);
+        this.addRenderableWidget(this.radioVolumeOption.createButton(
+                this.minecraft.options, this.width / 2 - 155, 40, 310
+        ));
 
         this.addRenderableWidget(Button.builder(Component.literal("Done"), b -> onClose())
                 .bounds(this.width / 2 - 100, this.height - 27, 200, 20)
@@ -90,9 +87,8 @@ public void onClose() {
 
     @Override
     public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
-        this.renderBackground(g);
+        this.renderBackground(g, mouseX, mouseY, partialTick);
         g.drawCenteredString(this.font, this.title, this.width / 2, 12, 0xFFFFFF);
-        this.list.render(g, mouseX, mouseY, partialTick);
         super.render(g, mouseX, mouseY, partialTick);
     }
 }
diff --git a/src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java b/common/src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java
similarity index 93%
rename from src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java
rename to common/src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java
index 0988e91..7ce8a4c 100644
--- a/src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java
+++ b/common/src/main/java/me/michiyo/openfm/client/screen/RadioScreen.java
@@ -16,8 +16,8 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class RadioScreen extends AbstractContainerScreen<RadioMenu> {
-    private static final ResourceLocation GUI_TEX = new ResourceLocation("openfm", "textures/gui/gui_radio.png");
-    private static final ResourceLocation BTN_TEX = new ResourceLocation("openfm", "textures/gui/buttons.png");
+    private static final ResourceLocation GUI_TEX = ResourceLocation.fromNamespaceAndPath("openfm", "textures/gui/gui_radio.png");
+    private static final ResourceLocation BTN_TEX = ResourceLocation.fromNamespaceAndPath("openfm", "textures/gui/buttons.png");
 
     private static final int TEX_W = 256;
     private static final int TEX_H = 256;
@@ -265,11 +265,11 @@ private void refreshLockSprite() {
     }
 
     private void sendButton(C2SButtonAction.Action action) {
-        Net.CH.sendToServer(new C2SButtonAction(menu.pos, action));
+        Net.sendToServer(new C2SButtonAction(menu.pos, action));
     }
 
     private void sendFieldsToServer() {
-        Net.CH.sendToServer(new C2SSetFields(menu.pos, urlBox.getValue(), colorBox.getValue(), textBox.getValue()));
+        Net.sendToServer(new C2SSetFields(menu.pos, urlBox.getValue(), colorBox.getValue(), textBox.getValue()));
     }
 
     public void applyServerSync(S2CSyncFields pkt) {
@@ -289,8 +289,7 @@ public void applyServerSync(S2CSyncFields pkt) {
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         // If the user is typing in any text box, do NOT let the inventory key (E) close the screen.
-        int invKey = Minecraft.getInstance().options.keyInventory.getKey().getValue();
-        if (keyCode == invKey) return true;
+        if (Minecraft.getInstance().options.keyInventory.matches(keyCode, scanCode)) return true;
 
         // ENTER saves fields
         if (keyCode == 257 || keyCode == 335) {
@@ -342,7 +341,7 @@ protected void renderBg(GuiGraphics g, float partialTick, int mouseX, int mouseY
 
     @Override
     public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
-        this.renderBackground(g);
+        this.renderBackground(g, mouseX, mouseY, partialTick);
         super.render(g, mouseX, mouseY, partialTick);
 
         if (debugGui) {
@@ -360,8 +359,12 @@ public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
     }
 
     private SpriteButton findHoveredSpriteButton() {
-        for (var r : this.renderables) {
-            if (r instanceof SpriteButton sb && sb.isHoveredOrFocused()) return sb;
+        SpriteButton[] buttons = {
+                playBtn, volDownBtn, volUpBtn, clearBtn, pasteBtn, saveBtn, deleteBtn,
+                lockBtn, saveToCardBtn, loadFromCardBtn, closeBtn
+        };
+        for (SpriteButton button : buttons) {
+            if (button != null && button.isHoveredOrFocused()) return button;
         }
         return null;
     }
diff --git a/src/main/java/me/michiyo/openfm/compat/cc/CCEvents.java b/common/src/main/java/me/michiyo/openfm/compat/cc/CCEvents.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/compat/cc/CCEvents.java
rename to common/src/main/java/me/michiyo/openfm/compat/cc/CCEvents.java
diff --git a/src/main/java/me/michiyo/openfm/compat/cc/OpenFMRadioPeripheral.java b/common/src/main/java/me/michiyo/openfm/compat/cc/OpenFMRadioPeripheral.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/compat/cc/OpenFMRadioPeripheral.java
rename to common/src/main/java/me/michiyo/openfm/compat/cc/OpenFMRadioPeripheral.java
diff --git a/common/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java b/common/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java
new file mode 100644
index 0000000..1c46ae5
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java
@@ -0,0 +1,20 @@
+package me.michiyo.openfm.config;
+
+import me.michiyo.openfm.platform.Services;
+
+public final class OpenFMClientConfig {
+    public static final VolumeValue RADIO_VOLUME = new VolumeValue();
+
+    public static final class VolumeValue {
+        public double get() {
+            return Services.PLATFORM.getRadioVolume();
+        }
+
+        public void set(double value) {
+            Services.PLATFORM.setRadioVolume(Math.max(0.0, Math.min(1.0, value)));
+        }
+    }
+
+    private OpenFMClientConfig() {}
+}
+
diff --git a/src/main/java/me/michiyo/openfm/net/C2SButtonAction.java b/common/src/main/java/me/michiyo/openfm/net/C2SButtonAction.java
similarity index 73%
rename from src/main/java/me/michiyo/openfm/net/C2SButtonAction.java
rename to common/src/main/java/me/michiyo/openfm/net/C2SButtonAction.java
index 538ed83..8519403 100644
--- a/src/main/java/me/michiyo/openfm/net/C2SButtonAction.java
+++ b/common/src/main/java/me/michiyo/openfm/net/C2SButtonAction.java
@@ -1,14 +1,21 @@
 package me.michiyo.openfm.net;
 
+import me.michiyo.openfm.OpenFM;
 import me.michiyo.openfm.world.be.RadioBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
 
-import java.util.function.Supplier;
-
-public class C2SButtonAction {
+public class C2SButtonAction implements CustomPacketPayload {
+    public static final Type<C2SButtonAction> TYPE = new Type<>(
+            ResourceLocation.fromNamespaceAndPath(OpenFM.MODID, "button_action")
+    );
+    public static final StreamCodec<RegistryFriendlyByteBuf, C2SButtonAction> STREAM_CODEC =
+            StreamCodec.of((buf, msg) -> encode(msg, buf), C2SButtonAction::decode);
     public enum Action {
         VOL_DOWN, VOL_UP,
         TOGGLE_LOCK,
@@ -40,15 +47,10 @@ public static C2SButtonAction decode(FriendlyByteBuf buf) {
         return new C2SButtonAction(pos, vals[ord]);
     }
 
-    public static void handle(C2SButtonAction msg, Supplier<NetworkEvent.Context> ctxSup) {
-        NetworkEvent.Context ctx = ctxSup.get();
-        ctx.enqueueWork(() -> {
-            ServerPlayer player = ctx.getSender();
-            if (player == null) return;
-
-            var level = player.serverLevel();
-            var be = level.getBlockEntity(msg.pos);
-            if (!(be instanceof RadioBlockEntity radio)) return;
+    public static void handle(C2SButtonAction msg, ServerPlayer player) {
+        var level = player.serverLevel();
+        var be = level.getBlockEntity(msg.pos);
+        if (!(be instanceof RadioBlockEntity radio)) return;
 
             boolean hasOwner = radio.getOwnerUuid() != null;
             boolean isOwner = hasOwner && radio.getOwnerUuid().equals(player.getUUID());
@@ -65,13 +67,13 @@ public static void handle(C2SButtonAction msg, Supplier<NetworkEvent.Context> ct
 
                 radio.setChanged();
                 S2CSyncFields.syncToTracking(level, msg.pos, radio);
-                return;
-            }
+            return;
+        }
 
             // For all other actions, enforce lock
             if (radio.isLocked() && hasOwner && !isOwner) {
-                return;
-            }
+            return;
+        }
 
             // If unowned, first editor becomes owner
             radio.ensureOwner(player.getUUID());
@@ -103,9 +105,12 @@ public static void handle(C2SButtonAction msg, Supplier<NetworkEvent.Context> ct
                 default -> {}
             }
 
-            radio.setChanged();
-            S2CSyncFields.syncToTracking(level, msg.pos, radio);
-        });
-        ctx.setPacketHandled(true);
+        radio.setChanged();
+        S2CSyncFields.syncToTracking(level, msg.pos, radio);
+    }
+
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
     }
 }
diff --git a/src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java b/common/src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java
similarity index 78%
rename from src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java
rename to common/src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java
index f521c40..d44c4b1 100644
--- a/src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java
+++ b/common/src/main/java/me/michiyo/openfm/net/C2SLinkSpeaker.java
@@ -1,20 +1,28 @@
 package me.michiyo.openfm.net;
 
+import me.michiyo.openfm.OpenFM;
 import me.michiyo.openfm.world.be.RadioBlockEntity;
 import me.michiyo.openfm.world.be.SpeakerBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.network.NetworkEvent;
 
-import java.util.function.Supplier;
-
-public class C2SLinkSpeaker {
+public class C2SLinkSpeaker implements CustomPacketPayload {
+    public static final Type<C2SLinkSpeaker> TYPE = new Type<>(
+            ResourceLocation.fromNamespaceAndPath(OpenFM.MODID, "link_speaker")
+    );
+    public static final StreamCodec<RegistryFriendlyByteBuf, C2SLinkSpeaker> STREAM_CODEC =
+            StreamCodec.of((buf, msg) -> encode(msg, buf), C2SLinkSpeaker::decode);
     private final boolean unlink;
 
     private final ResourceKey<Level> speakerDim;
@@ -61,13 +69,8 @@ public static C2SLinkSpeaker decode(FriendlyByteBuf buf) {
         return new C2SLinkSpeaker(unlink, speakerDim, speakerPos, radioDim, radioPos);
     }
 
-    public static void handle(C2SLinkSpeaker msg, Supplier<NetworkEvent.Context> ctxSup) {
-        NetworkEvent.Context ctx = ctxSup.get();
-
-        ctx.enqueueWork(() -> {
-            if (ctx.getSender() == null) return;
-
-            ServerLevel speakerLevel = ctx.getSender().server.getLevel(msg.speakerDim);
+    public static void handle(C2SLinkSpeaker msg, ServerPlayer player) {
+            ServerLevel speakerLevel = player.server.getLevel(msg.speakerDim);
             if (speakerLevel == null) return;
             if (!speakerLevel.isLoaded(msg.speakerPos)) return;
 
@@ -80,7 +83,7 @@ public static void handle(C2SLinkSpeaker msg, Supplier<NetworkEvent.Context> ctx
                 return;
             }
 
-            ServerLevel radioLevel = ctx.getSender().server.getLevel(msg.radioDim);
+            ServerLevel radioLevel = player.server.getLevel(msg.radioDim);
             if (radioLevel == null) return;
             if (!radioLevel.isLoaded(msg.radioPos)) return;
 
@@ -95,9 +98,11 @@ public static void handle(C2SLinkSpeaker msg, Supplier<NetworkEvent.Context> ctx
 
             speakerBe.setLink(msg.radioDim, msg.radioPos);
             sendSpeakerUpdate(speakerLevel, msg.speakerPos);
-        });
+    }
 
-        ctx.setPacketHandled(true);
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
     }
 
     private static void sendSpeakerUpdate(ServerLevel level, BlockPos pos) {
diff --git a/src/main/java/me/michiyo/openfm/net/C2SSetFields.java b/common/src/main/java/me/michiyo/openfm/net/C2SSetFields.java
similarity index 69%
rename from src/main/java/me/michiyo/openfm/net/C2SSetFields.java
rename to common/src/main/java/me/michiyo/openfm/net/C2SSetFields.java
index e9acab3..1139e3a 100644
--- a/src/main/java/me/michiyo/openfm/net/C2SSetFields.java
+++ b/common/src/main/java/me/michiyo/openfm/net/C2SSetFields.java
@@ -1,14 +1,21 @@
 package me.michiyo.openfm.net;
 
+import me.michiyo.openfm.OpenFM;
 import me.michiyo.openfm.world.be.RadioBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
 
-import java.util.function.Supplier;
-
-public class C2SSetFields {
+public class C2SSetFields implements CustomPacketPayload {
+    public static final Type<C2SSetFields> TYPE = new Type<>(
+            ResourceLocation.fromNamespaceAndPath(OpenFM.MODID, "set_fields")
+    );
+    public static final StreamCodec<RegistryFriendlyByteBuf, C2SSetFields> STREAM_CODEC =
+            StreamCodec.of((buf, msg) -> encode(msg, buf), C2SSetFields::decode);
     public final BlockPos pos;
     public final String url;
     public final String screenColor;
@@ -37,12 +44,7 @@ public static C2SSetFields decode(FriendlyByteBuf buf) {
         );
     }
 
-    public static void handle(C2SSetFields msg, Supplier<NetworkEvent.Context> ctxSup) {
-        NetworkEvent.Context ctx = ctxSup.get();
-        ctx.enqueueWork(() -> {
-            ServerPlayer player = ctx.getSender();
-            if (player == null) return;
-
+    public static void handle(C2SSetFields msg, ServerPlayer player) {
             var level = player.serverLevel();
             var be = level.getBlockEntity(msg.pos);
             if (!(be instanceof RadioBlockEntity radio)) return;
@@ -69,9 +71,12 @@ public static void handle(C2SSetFields msg, Supplier<NetworkEvent.Context> ctxSu
                 radio.setScreenText(text);
             }
 
-            radio.setChanged();
-            S2CSyncFields.syncToTracking(level, msg.pos, radio);
-        });
-        ctx.setPacketHandled(true);
+        radio.setChanged();
+        S2CSyncFields.syncToTracking(level, msg.pos, radio);
+    }
+
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
     }
 }
diff --git a/src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java b/common/src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java
similarity index 72%
rename from src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java
rename to common/src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java
index 92c68b1..b29daa8 100644
--- a/src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java
+++ b/common/src/main/java/me/michiyo/openfm/net/MemoryCardLogic.java
@@ -1,8 +1,10 @@
 package me.michiyo.openfm.net;
 
 import me.michiyo.openfm.world.be.RadioBlockEntity;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.CustomData;
 
 public final class MemoryCardLogic {
     private static final String ROOT = "OpenFMCard";
@@ -11,7 +13,6 @@ public static void saveToCard(RadioBlockEntity radio) {
         ItemStack card = radio.getInventory().getItem(0);
         if (card.isEmpty()) return;
 
-        CompoundTag tag = card.getOrCreateTag();
         CompoundTag root = new CompoundTag();
 
         root.putString("StreamUrl", radio.getStreamUrl());
@@ -19,17 +20,16 @@ public static void saveToCard(RadioBlockEntity radio) {
         root.putString("ScreenColor", radio.getScreenColor());
         root.putString("ScreenText", radio.getScreenText());
 
-        tag.put(ROOT, root);
-        card.setTag(tag);
+        CustomData.update(DataComponents.CUSTOM_DATA, card, tag -> tag.put(ROOT, root));
         radio.setChanged();
     }
 
     public static void loadFromCard(RadioBlockEntity radio) {
         ItemStack card = radio.getInventory().getItem(0);
-        if (card.isEmpty() || !card.hasTag()) return;
+        if (card.isEmpty()) return;
 
-        CompoundTag tag = card.getTag();
-        if (tag == null || !tag.contains(ROOT)) return;
+        CompoundTag tag = card.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
+        if (!tag.contains(ROOT)) return;
 
         CompoundTag root = tag.getCompound(ROOT);
 
@@ -41,13 +41,9 @@ public static void loadFromCard(RadioBlockEntity radio) {
 
     public static void deleteFromCard(RadioBlockEntity radio) {
         ItemStack card = radio.getInventory().getItem(0);
-        if (card.isEmpty() || !card.hasTag()) return;
-
-        CompoundTag tag = card.getTag();
-        if (tag == null) return;
+        if (card.isEmpty()) return;
 
-        tag.remove(ROOT);
-        card.setTag(tag);
+        CustomData.update(DataComponents.CUSTOM_DATA, card, tag -> tag.remove(ROOT));
         radio.setChanged();
     }
 
diff --git a/common/src/main/java/me/michiyo/openfm/net/Net.java b/common/src/main/java/me/michiyo/openfm/net/Net.java
new file mode 100644
index 0000000..73144ab
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/net/Net.java
@@ -0,0 +1,13 @@
+package me.michiyo.openfm.net;
+
+import me.michiyo.openfm.platform.Services;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+
+public final class Net {
+    public static void sendToServer(CustomPacketPayload payload) {
+        Services.PLATFORM.sendToServer(payload);
+    }
+
+    private Net() {}
+}
+
diff --git a/src/main/java/me/michiyo/openfm/net/S2CSyncFields.java b/common/src/main/java/me/michiyo/openfm/net/S2CSyncFields.java
similarity index 73%
rename from src/main/java/me/michiyo/openfm/net/S2CSyncFields.java
rename to common/src/main/java/me/michiyo/openfm/net/S2CSyncFields.java
index 73f9a41..846af39 100644
--- a/src/main/java/me/michiyo/openfm/net/S2CSyncFields.java
+++ b/common/src/main/java/me/michiyo/openfm/net/S2CSyncFields.java
@@ -1,17 +1,24 @@
 package me.michiyo.openfm.net;
 
+import me.michiyo.openfm.OpenFM;
 import me.michiyo.openfm.client.screen.RadioScreen;
+import me.michiyo.openfm.platform.Services;
 import me.michiyo.openfm.world.be.RadioBlockEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraftforge.network.NetworkEvent;
-import net.minecraftforge.network.PacketDistributor;
 
-import java.util.function.Supplier;
-
-public class S2CSyncFields {
+public class S2CSyncFields implements CustomPacketPayload {
+    public static final Type<S2CSyncFields> TYPE = new Type<>(
+            ResourceLocation.fromNamespaceAndPath(OpenFM.MODID, "sync_fields")
+    );
+    public static final StreamCodec<RegistryFriendlyByteBuf, S2CSyncFields> STREAM_CODEC =
+            StreamCodec.of((buf, msg) -> encode(msg, buf), S2CSyncFields::decode);
     public final BlockPos pos;
     public final String url;
     public final String screenColor;
@@ -52,11 +59,9 @@ public static S2CSyncFields decode(FriendlyByteBuf buf) {
         );
     }
 
-    public static void handle(S2CSyncFields msg, Supplier<NetworkEvent.Context> ctxSup) {
-        NetworkEvent.Context ctx = ctxSup.get();
-        ctx.enqueueWork(() -> {
-            Minecraft mc = Minecraft.getInstance();
-            if (mc.level == null) return;
+    public static void handle(S2CSyncFields msg) {
+        Minecraft mc = Minecraft.getInstance();
+        if (mc.level == null) return;
 
             var be = mc.level.getBlockEntity(msg.pos);
             if (be instanceof RadioBlockEntity radio) {
@@ -67,10 +72,11 @@ public static void handle(S2CSyncFields msg, Supplier<NetworkEvent.Context> ctxS
             if (mc.screen instanceof RadioScreen screen) {
                 screen.applyServerSync(msg);
             }
-        });
+    }
 
-        //System.out.println("[OpenFM] S2C received for " + msg.pos + " color=" + msg.screenColor + " text=" + msg.screenText + " playing=" + msg.playing);
-        ctx.setPacketHandled(true);
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
     }
 
     public static void syncToTracking(ServerLevel level, BlockPos pos, RadioBlockEntity radio) {
@@ -83,7 +89,7 @@ public static void syncToTracking(ServerLevel level, BlockPos pos, RadioBlockEnt
                 radio.isLocked(),
                 radio.isPlaying()
         );
-        Net.CH.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(pos)), pkt);
+        Services.PLATFORM.sendToTracking(level, pos, pkt);
     }
 
     public static void syncToPlayer(net.minecraft.server.level.ServerPlayer player, BlockPos pos, RadioBlockEntity radio) {
@@ -96,6 +102,6 @@ public static void syncToPlayer(net.minecraft.server.level.ServerPlayer player,
                 radio.isLocked(),
                 radio.isPlaying()
         );
-        Net.CH.send(PacketDistributor.PLAYER.with(() -> player), pkt);
+        Services.PLATFORM.sendToPlayer(player, pkt);
     }
 }
diff --git a/common/src/main/java/me/michiyo/openfm/platform/OpenFMPlatform.java b/common/src/main/java/me/michiyo/openfm/platform/OpenFMPlatform.java
new file mode 100644
index 0000000..3f8004f
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/platform/OpenFMPlatform.java
@@ -0,0 +1,28 @@
+package me.michiyo.openfm.platform;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.MenuProvider;
+
+public interface OpenFMPlatform {
+    String loaderName();
+
+    boolean isModLoaded(String modId);
+
+    boolean isPhysicalClient();
+
+    void sendToServer(CustomPacketPayload payload);
+
+    void sendToPlayer(ServerPlayer player, CustomPacketPayload payload);
+
+    void sendToTracking(ServerLevel level, BlockPos pos, CustomPacketPayload payload);
+
+    void openMenu(ServerPlayer player, MenuProvider provider, BlockPos pos);
+
+    double getRadioVolume();
+
+    void setRadioVolume(double volume);
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/platform/OpenFMRegistrar.java b/common/src/main/java/me/michiyo/openfm/platform/OpenFMRegistrar.java
new file mode 100644
index 0000000..2debf77
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/platform/OpenFMRegistrar.java
@@ -0,0 +1,36 @@
+package me.michiyo.openfm.platform;
+
+import me.michiyo.openfm.world.menu.RadioMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.function.Supplier;
+
+public interface OpenFMRegistrar {
+    RegistrySupplier<Block> registerBlock(String name, Supplier<? extends Block> factory);
+
+    RegistrySupplier<Item> registerItem(String name, Supplier<? extends Item> factory);
+
+    <T extends net.minecraft.world.level.block.entity.BlockEntity> RegistrySupplier<BlockEntityType<T>> registerBlockEntity(
+            String name, BlockEntityFactory<T> factory, RegistrySupplier<? extends Block>... blocks);
+
+    RegistrySupplier<MenuType<RadioMenu>> registerRadioMenu(String name);
+
+    RegistrySupplier<CreativeModeTab> registerCreativeTab(
+            String name,
+            Component title,
+            Supplier<ItemStack> icon,
+            CreativeModeTab.DisplayItemsGenerator displayItems);
+
+    @FunctionalInterface
+    interface BlockEntityFactory<T extends net.minecraft.world.level.block.entity.BlockEntity> {
+        T create(BlockPos pos, BlockState state);
+    }
+}
diff --git a/common/src/main/java/me/michiyo/openfm/platform/RegistrySupplier.java b/common/src/main/java/me/michiyo/openfm/platform/RegistrySupplier.java
new file mode 100644
index 0000000..0f5f7a8
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/platform/RegistrySupplier.java
@@ -0,0 +1,8 @@
+package me.michiyo.openfm.platform;
+
+import java.util.function.Supplier;
+
+@FunctionalInterface
+public interface RegistrySupplier<T> extends Supplier<T> {
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/platform/Services.java b/common/src/main/java/me/michiyo/openfm/platform/Services.java
new file mode 100644
index 0000000..e403bea
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/platform/Services.java
@@ -0,0 +1,12 @@
+package me.michiyo.openfm.platform;
+
+import java.util.ServiceLoader;
+
+public final class Services {
+    public static final OpenFMPlatform PLATFORM = ServiceLoader.load(OpenFMPlatform.class)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("No OpenFM platform service was found"));
+
+    private Services() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java b/common/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java
new file mode 100644
index 0000000..499bcc7
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java
@@ -0,0 +1,19 @@
+package me.michiyo.openfm.reg;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.be.RadioBlockEntity;
+import me.michiyo.openfm.world.be.SpeakerBlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
+public final class ModBlockEntities {
+    public static RegistrySupplier<BlockEntityType<RadioBlockEntity>> RADIO_BE;
+    public static RegistrySupplier<BlockEntityType<SpeakerBlockEntity>> SPEAKER_BE;
+
+    public static void register(OpenFMRegistrar registrar) {
+        RADIO_BE = registrar.registerBlockEntity("radio_be", RadioBlockEntity::new, ModBlocks.RADIO_BLOCK);
+        SPEAKER_BE = registrar.registerBlockEntity("speaker_be", SpeakerBlockEntity::new, ModBlocks.SPEAKER_BLOCK);
+    }
+
+    private ModBlockEntities() {}
+}
diff --git a/common/src/main/java/me/michiyo/openfm/reg/ModBlocks.java b/common/src/main/java/me/michiyo/openfm/reg/ModBlocks.java
new file mode 100644
index 0000000..0fbb048
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/reg/ModBlocks.java
@@ -0,0 +1,24 @@
+package me.michiyo.openfm.reg;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.block.RadioBlock;
+import me.michiyo.openfm.world.block.SpeakerBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.material.MapColor;
+
+public final class ModBlocks {
+    public static RegistrySupplier<Block> RADIO_BLOCK;
+    public static RegistrySupplier<Block> SPEAKER_BLOCK;
+
+    public static void register(OpenFMRegistrar registrar) {
+        RADIO_BLOCK = registrar.registerBlock("radio_block",
+                () -> new RadioBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F).requiresCorrectToolForDrops()));
+        SPEAKER_BLOCK = registrar.registerBlock("speaker_block",
+                () -> new SpeakerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F).requiresCorrectToolForDrops()));
+    }
+
+    private ModBlocks() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java b/common/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java
new file mode 100644
index 0000000..f714f50
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java
@@ -0,0 +1,26 @@
+package me.michiyo.openfm.reg;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.ItemStack;
+
+public final class ModCreativeTabs {
+    public static RegistrySupplier<CreativeModeTab> OPENFM_TAB;
+
+    public static void register(OpenFMRegistrar registrar) {
+        OPENFM_TAB = registrar.registerCreativeTab(
+                "openfm",
+                Component.literal("OpenFM"),
+                () -> new ItemStack(ModItems.RADIO_BLOCK_ITEM.get()),
+                (params, output) -> {
+                    output.accept(ModItems.RADIO_BLOCK_ITEM.get());
+                    output.accept(ModItems.SPEAKER_BLOCK_ITEM.get());
+                    output.accept(ModItems.MEMORY_CARD.get());
+                    output.accept(ModItems.TUNER.get());
+                });
+    }
+
+    private ModCreativeTabs() {}
+}
diff --git a/common/src/main/java/me/michiyo/openfm/reg/ModItems.java b/common/src/main/java/me/michiyo/openfm/reg/ModItems.java
new file mode 100644
index 0000000..edc2470
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/reg/ModItems.java
@@ -0,0 +1,28 @@
+package me.michiyo.openfm.reg;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.item.OpenFMTunerItem;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+
+public final class ModItems {
+    public static RegistrySupplier<Item> RADIO_BLOCK_ITEM;
+    public static RegistrySupplier<Item> SPEAKER_BLOCK_ITEM;
+    public static RegistrySupplier<Item> MEMORY_CARD;
+    public static RegistrySupplier<Item> TUNER;
+
+    public static void register(OpenFMRegistrar registrar) {
+        RADIO_BLOCK_ITEM = registrar.registerItem("radio_block",
+                () -> new BlockItem(ModBlocks.RADIO_BLOCK.get(), new Item.Properties()));
+        SPEAKER_BLOCK_ITEM = registrar.registerItem("speaker_block",
+                () -> new BlockItem(ModBlocks.SPEAKER_BLOCK.get(), new Item.Properties()));
+        MEMORY_CARD = registrar.registerItem("memory_card",
+                () -> new Item(new Item.Properties().stacksTo(1)));
+        TUNER = registrar.registerItem("tuner",
+                () -> new OpenFMTunerItem(new Item.Properties().stacksTo(1)));
+    }
+
+    private ModItems() {}
+}
+
diff --git a/common/src/main/java/me/michiyo/openfm/reg/ModMenus.java b/common/src/main/java/me/michiyo/openfm/reg/ModMenus.java
new file mode 100644
index 0000000..56f6b75
--- /dev/null
+++ b/common/src/main/java/me/michiyo/openfm/reg/ModMenus.java
@@ -0,0 +1,17 @@
+package me.michiyo.openfm.reg;
+
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.menu.RadioMenu;
+import net.minecraft.world.inventory.MenuType;
+
+public final class ModMenus {
+    public static RegistrySupplier<MenuType<RadioMenu>> RADIO_MENU;
+
+    public static void register(OpenFMRegistrar registrar) {
+        RADIO_MENU = registrar.registerRadioMenu("radio_menu");
+    }
+
+    private ModMenus() {}
+}
+
diff --git a/src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java b/common/src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java
similarity index 92%
rename from src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java
rename to common/src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java
index 96fa5f3..69ef302 100644
--- a/src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java
+++ b/common/src/main/java/me/michiyo/openfm/world/be/RadioBlockEntity.java
@@ -3,9 +3,10 @@
 import me.michiyo.openfm.client.audio.RadioStreamManager;
 import me.michiyo.openfm.net.S2CSyncFields;
 import me.michiyo.openfm.reg.ModBlockEntities;
+import me.michiyo.openfm.platform.Services;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.SimpleContainer;
@@ -158,8 +159,8 @@ public void setScreenText(String t) {
     public SimpleContainer getInventory() { return inv; }
 
     @Override
-    protected void saveAdditional(CompoundTag tag) {
-        super.saveAdditional(tag);
+    protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.saveAdditional(tag, registries);
 
         if (ownerUuid != null) tag.putUUID("Owner", ownerUuid);
         tag.putBoolean("Locked", locked);
@@ -173,13 +174,13 @@ protected void saveAdditional(CompoundTag tag) {
 
         CompoundTag invTag = new CompoundTag();
         ItemStack stack = inv.getItem(0);
-        if (!stack.isEmpty()) invTag.put("MemoryCard", stack.save(new CompoundTag()));
+        if (!stack.isEmpty()) invTag.put("MemoryCard", stack.save(registries));
         tag.put("Inv", invTag);
     }
 
     @Override
-    public void load(CompoundTag tag) {
-        super.load(tag);
+    protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.loadAdditional(tag, registries);
 
         ownerUuid = tag.hasUUID("Owner") ? tag.getUUID("Owner") : null;
         locked = tag.getBoolean("Locked");
@@ -195,9 +196,10 @@ public void load(CompoundTag tag) {
         if (tag.contains("Inv")) {
             CompoundTag invTag = tag.getCompound("Inv");
             if (invTag.contains("MemoryCard")) {
-                inv.setItem(0, ItemStack.of(invTag.getCompound("MemoryCard")));
+                inv.setItem(0, ItemStack.parseOptional(registries, invTag.getCompound("MemoryCard")));
             }
         }
+        clientApplyAudioState();
     }
 
     // ---- client audio wiring (RESPECT playing) ----
@@ -231,14 +233,6 @@ public void applyClientSync(String url, String color, String text, int volume, b
         }
     }
 
-    @Override
-    public void onLoad() {
-        super.onLoad();
-        if (level != null && level.isClientSide) {
-            clientApplyAudioState();
-        }
-    }
-
     @Override
     public void setRemoved() {
         if (level != null && level.isClientSide) {
@@ -250,14 +244,8 @@ public void setRemoved() {
     // ---- BE sync plumbing ----
 
     @Override
-    public CompoundTag getUpdateTag() {
-        return saveWithoutMetadata();
-    }
-
-    @Override
-    public void handleUpdateTag(CompoundTag tag) {
-        load(tag);
-        clientApplyAudioState();
+    public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
+        return saveWithoutMetadata(registries);
     }
 
     @Override
@@ -265,15 +253,6 @@ public ClientboundBlockEntityDataPacket getUpdatePacket() {
         return ClientboundBlockEntityDataPacket.create(this);
     }
 
-    @Override
-    public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) {
-        CompoundTag tag = pkt.getTag();
-        if (tag != null) {
-            load(tag);
-            clientApplyAudioState();
-        }
-    }
-
     // ---- ComputerCraft (CC:Tweaked) control ----
 
     /**
@@ -375,7 +354,7 @@ public String cc_getStreamUrl() {
     private void cc_event(String event, Object... args) {
         if (this.level == null || this.level.isClientSide) return;
         if (!(this.level instanceof net.minecraft.server.level.ServerLevel serverLevel)) return;
-        if (!net.minecraftforge.fml.ModList.get().isLoaded("computercraft")) return;
+        if (!Services.PLATFORM.isModLoaded("computercraft")) return;
 
         try {
             Class<?> cls = Class.forName("me.michiyo.openfm.compat.cc.CCEvents");
diff --git a/src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java b/common/src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java
similarity index 81%
rename from src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java
rename to common/src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java
index fe89b56..c75ca14 100644
--- a/src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java
+++ b/common/src/main/java/me/michiyo/openfm/world/be/SpeakerBlockEntity.java
@@ -1,9 +1,12 @@
 package me.michiyo.openfm.world.be;
 
 import me.michiyo.openfm.reg.ModBlockEntities;
+import me.michiyo.openfm.platform.Services;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
@@ -11,8 +14,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
 
 public class SpeakerBlockEntity extends BlockEntity {
     private static final String NBT_LINKED_DIM = "LinkedDim";
@@ -89,19 +90,19 @@ private void syncToClient() {
     // -----------------------
 
     private static void clientRegisterEmitter(BlockPos radioPos, BlockPos speakerPos) {
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
+        if (Services.PLATFORM.isPhysicalClient()) {
             me.michiyo.openfm.client.audio.RadioStreamManager.setEmitterForRadio(
                     radioPos,
                     speakerPos,
                     Vec3.atCenterOf(speakerPos)
             );
-        });
+        }
     }
 
     private static void clientUnregisterEmitter(BlockPos radioPos, BlockPos speakerPos) {
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
+        if (Services.PLATFORM.isPhysicalClient()) {
             me.michiyo.openfm.client.audio.RadioStreamManager.clearEmitterForRadio(radioPos, speakerPos);
-        });
+        }
     }
 
     /**
@@ -121,6 +122,17 @@ private void clientRefreshEmitterRegistration() {
         // If currently linked, register as an emitter (ALWAYS; do not gate on activeUrl/activeVol)
         if (linkedRadioPos != null) {
             clientRegisterEmitter(linkedRadioPos, worldPosition);
+
+            if (activeUrl != null && !activeUrl.isEmpty() && activeVol > 0) {
+                me.michiyo.openfm.client.audio.RadioStreamManager.setDesired(
+                        linkedRadioPos,
+                        activeUrl,
+                        activeVol,
+                        Vec3.atCenterOf(worldPosition)
+                );
+            } else {
+                me.michiyo.openfm.client.audio.RadioStreamManager.clearDesired(linkedRadioPos);
+            }
         }
 
         lastClientLinkedRadioPos = linkedRadioPos;
@@ -163,8 +175,12 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Speak
             return;
         }
 
-        // Mirror radio settings
-        be.setActive(radioBe.getStreamUrl(), radioBe.getVolume());
+        // Mirror only active playback. A configured but stopped radio must remain silent.
+        if (radioBe.isPlaying()) {
+            be.setActive(radioBe.getStreamUrl(), radioBe.getVolume());
+        } else {
+            be.setActive("", 0);
+        }
     }
 
     // -----------------------
@@ -172,12 +188,12 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Speak
     // -----------------------
 
     @Override
-    public void load(CompoundTag tag) {
-        super.load(tag);
+    protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.loadAdditional(tag, registries);
 
         String dimStr = tag.getString(NBT_LINKED_DIM);
         if (dimStr != null && !dimStr.isEmpty()) {
-            this.linkedDim = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(dimStr));
+            this.linkedDim = ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(dimStr));
         } else {
             this.linkedDim = null;
         }
@@ -196,8 +212,8 @@ public void load(CompoundTag tag) {
     }
 
     @Override
-    protected void saveAdditional(CompoundTag tag) {
-        super.saveAdditional(tag);
+    protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.saveAdditional(tag, registries);
 
         tag.putString(NBT_LINKED_DIM, linkedDim == null ? "" : linkedDim.location().toString());
         if (linkedRadioPos != null) {
@@ -209,23 +225,15 @@ protected void saveAdditional(CompoundTag tag) {
     }
 
     @Override
-    public CompoundTag getUpdateTag() {
+    public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
         CompoundTag tag = new CompoundTag();
-        saveAdditional(tag);
+        saveAdditional(tag, registries);
         return tag;
     }
 
     @Override
-    public void handleUpdateTag(CompoundTag tag) {
-        super.handleUpdateTag(tag);
-        // load() is not guaranteed to be called here, so refresh using current fields
-        clientRefreshEmitterRegistration();
-    }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-        clientRefreshEmitterRegistration();
+    public ClientboundBlockEntityDataPacket getUpdatePacket() {
+        return ClientboundBlockEntityDataPacket.create(this);
     }
 
     @Override
diff --git a/src/main/java/me/michiyo/openfm/world/block/RadioBlock.java b/common/src/main/java/me/michiyo/openfm/world/block/RadioBlock.java
similarity index 84%
rename from src/main/java/me/michiyo/openfm/world/block/RadioBlock.java
rename to common/src/main/java/me/michiyo/openfm/world/block/RadioBlock.java
index 7c75f51..0bb4416 100644
--- a/src/main/java/me/michiyo/openfm/world/block/RadioBlock.java
+++ b/common/src/main/java/me/michiyo/openfm/world/block/RadioBlock.java
@@ -1,12 +1,13 @@
 package me.michiyo.openfm.world.block;
 
+import com.mojang.serialization.MapCodec;
 import me.michiyo.openfm.world.be.RadioBlockEntity;
 import me.michiyo.openfm.world.menu.RadioMenu;
+import me.michiyo.openfm.platform.Services;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleMenuProvider;
@@ -22,11 +23,11 @@
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraftforge.network.NetworkHooks;
 
 import javax.annotation.Nullable;
 
 public class RadioBlock extends BaseEntityBlock {
+    public static final MapCodec<RadioBlock> CODEC = simpleCodec(RadioBlock::new);
     public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 
     public RadioBlock(Properties props) {
@@ -34,6 +35,11 @@ public RadioBlock(Properties props) {
         this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH));
     }
 
+    @Override
+    protected MapCodec<? extends BaseEntityBlock> codec() {
+        return CODEC;
+    }
+
     @Override
     public RenderShape getRenderShape(BlockState state) {
         return RenderShape.MODEL;
@@ -57,7 +63,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<net.minecraft.
     }
 
     @Override
-    public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+    protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) {
         if (level.isClientSide) return InteractionResult.SUCCESS;
 
         BlockEntity be = level.getBlockEntity(pos);
@@ -70,7 +76,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
                 Component.literal("OpenFM")
         );
 
-        NetworkHooks.openScreen((ServerPlayer) player, provider, buf -> buf.writeBlockPos(pos));
+        Services.PLATFORM.openMenu((ServerPlayer) player, provider, pos);
         return InteractionResult.CONSUME;
     }
 }
diff --git a/src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java b/common/src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java
similarity index 92%
rename from src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java
rename to common/src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java
index a52b1c7..2cc571c 100644
--- a/src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java
+++ b/common/src/main/java/me/michiyo/openfm/world/block/SpeakerBlock.java
@@ -1,5 +1,6 @@
 package me.michiyo.openfm.world.block;
 
+import com.mojang.serialization.MapCodec;
 import me.michiyo.openfm.world.be.SpeakerBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -19,6 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 
 public class SpeakerBlock extends BaseEntityBlock {
+    public static final MapCodec<SpeakerBlock> CODEC = simpleCodec(SpeakerBlock::new);
     public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 
     public SpeakerBlock(Properties props) {
@@ -26,6 +28,11 @@ public SpeakerBlock(Properties props) {
         this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH));
     }
 
+    @Override
+    protected MapCodec<? extends BaseEntityBlock> codec() {
+        return CODEC;
+    }
+
     @Override
     public RenderShape getRenderShape(BlockState state) {
         return RenderShape.MODEL;
diff --git a/src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java b/common/src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java
similarity index 84%
rename from src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java
rename to common/src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java
index 25564dd..ded2159 100644
--- a/src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java
+++ b/common/src/main/java/me/michiyo/openfm/world/item/OpenFMTunerItem.java
@@ -8,12 +8,14 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 
@@ -37,7 +39,7 @@ public InteractionResult useOn(UseOnContext ctx) {
                 // send packet client-side
                 if (level.isClientSide) {
                     ResourceKey<Level> dim = level.dimension();
-                    Net.CH.sendToServer(C2SLinkSpeaker.unlink(dim, clicked));
+                    Net.sendToServer(C2SLinkSpeaker.unlink(dim, clicked));
                 }
 
                 clearSpeakerSelection(stack);
@@ -80,7 +82,7 @@ public InteractionResult useOn(UseOnContext ctx) {
 
             // send packet client-side
             if (level.isClientSide) {
-                Net.CH.sendToServer(C2SLinkSpeaker.link(sel.dim, sel.pos, level.dimension(), clicked));
+                Net.sendToServer(C2SLinkSpeaker.link(sel.dim, sel.pos, level.dimension(), clicked));
             }
 
             clearSpeakerSelection(stack);
@@ -99,27 +101,27 @@ public InteractionResult useOn(UseOnContext ctx) {
     }
 
     private static void setSpeakerSelection(ItemStack stack, ResourceKey<Level> dim, BlockPos pos) {
-        CompoundTag tag = stack.getOrCreateTag();
-        tag.putString(NBT_SPK_DIM, dim.location().toString());
-        tag.putLong(NBT_SPK_POS, pos.asLong());
+        CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> {
+            tag.putString(NBT_SPK_DIM, dim.location().toString());
+            tag.putLong(NBT_SPK_POS, pos.asLong());
+        });
     }
 
     private static void clearSpeakerSelection(ItemStack stack) {
-        CompoundTag tag = stack.getTag();
-        if (tag == null) return;
-        tag.remove(NBT_SPK_DIM);
-        tag.remove(NBT_SPK_POS);
+        CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> {
+            tag.remove(NBT_SPK_DIM);
+            tag.remove(NBT_SPK_POS);
+        });
     }
 
     private static SpeakerSel getSpeakerSelection(ItemStack stack) {
-        CompoundTag tag = stack.getTag();
-        if (tag == null) return null;
+        CompoundTag tag = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
         if (!tag.contains(NBT_SPK_DIM) || !tag.contains(NBT_SPK_POS)) return null;
 
         String dimStr = tag.getString(NBT_SPK_DIM);
         if (dimStr == null || dimStr.isEmpty()) return null;
 
-        ResourceKey<Level> dim = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(dimStr));
+        ResourceKey<Level> dim = ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(dimStr));
         BlockPos pos = BlockPos.of(tag.getLong(NBT_SPK_POS));
         return new SpeakerSel(dim, pos);
     }
diff --git a/src/main/java/me/michiyo/openfm/world/menu/RadioMenu.java b/common/src/main/java/me/michiyo/openfm/world/menu/RadioMenu.java
similarity index 100%
rename from src/main/java/me/michiyo/openfm/world/menu/RadioMenu.java
rename to common/src/main/java/me/michiyo/openfm/world/menu/RadioMenu.java
diff --git a/src/main/resources/assets/openfm/blockstates/radio_block.json b/common/src/main/resources/assets/openfm/blockstates/radio_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/blockstates/radio_block.json
rename to common/src/main/resources/assets/openfm/blockstates/radio_block.json
diff --git a/src/main/resources/assets/openfm/blockstates/speaker_block.json b/common/src/main/resources/assets/openfm/blockstates/speaker_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/blockstates/speaker_block.json
rename to common/src/main/resources/assets/openfm/blockstates/speaker_block.json
diff --git a/src/main/resources/assets/openfm/lang/en_us.json b/common/src/main/resources/assets/openfm/lang/en_us.json
similarity index 79%
rename from src/main/resources/assets/openfm/lang/en_us.json
rename to common/src/main/resources/assets/openfm/lang/en_us.json
index 407b542..f05c630 100644
--- a/src/main/resources/assets/openfm/lang/en_us.json
+++ b/common/src/main/resources/assets/openfm/lang/en_us.json
@@ -3,6 +3,5 @@
   "item.openfm.memory_card": "Memory Card",
   "item.openfm.radio_block": "OpenFM Radio",
   "item.openfm.tuner": "Tuner",
-  "block.openfm.speaker_block": "Speaker",
-
+  "block.openfm.speaker_block": "Speaker"
 }
diff --git a/src/main/resources/assets/openfm/models/block/radio_block.json b/common/src/main/resources/assets/openfm/models/block/radio_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/models/block/radio_block.json
rename to common/src/main/resources/assets/openfm/models/block/radio_block.json
diff --git a/src/main/resources/assets/openfm/models/block/speaker_block.json b/common/src/main/resources/assets/openfm/models/block/speaker_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/models/block/speaker_block.json
rename to common/src/main/resources/assets/openfm/models/block/speaker_block.json
diff --git a/common/src/main/resources/assets/openfm/models/item/memory_card.json b/common/src/main/resources/assets/openfm/models/item/memory_card.json
new file mode 100644
index 0000000..470db87
--- /dev/null
+++ b/common/src/main/resources/assets/openfm/models/item/memory_card.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "openfm:item/memory_card"
+  }
+}
diff --git a/src/main/resources/assets/openfm/models/item/radio_block.json b/common/src/main/resources/assets/openfm/models/item/radio_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/models/item/radio_block.json
rename to common/src/main/resources/assets/openfm/models/item/radio_block.json
diff --git a/src/main/resources/assets/openfm/models/item/speaker_block.json b/common/src/main/resources/assets/openfm/models/item/speaker_block.json
similarity index 100%
rename from src/main/resources/assets/openfm/models/item/speaker_block.json
rename to common/src/main/resources/assets/openfm/models/item/speaker_block.json
diff --git a/common/src/main/resources/assets/openfm/models/item/tuner.json b/common/src/main/resources/assets/openfm/models/item/tuner.json
new file mode 100644
index 0000000..4cf7c8a
--- /dev/null
+++ b/common/src/main/resources/assets/openfm/models/item/tuner.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "openfm:item/tuner"
+  }
+}
diff --git a/src/main/resources/assets/openfm/textures/block/radio_front.png b/common/src/main/resources/assets/openfm/textures/block/radio_front.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/block/radio_front.png
rename to common/src/main/resources/assets/openfm/textures/block/radio_front.png
diff --git a/src/main/resources/assets/openfm/textures/block/radio_side.png b/common/src/main/resources/assets/openfm/textures/block/radio_side.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/block/radio_side.png
rename to common/src/main/resources/assets/openfm/textures/block/radio_side.png
diff --git a/src/main/resources/assets/openfm/textures/block/speaker_front.png b/common/src/main/resources/assets/openfm/textures/block/speaker_front.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/block/speaker_front.png
rename to common/src/main/resources/assets/openfm/textures/block/speaker_front.png
diff --git a/src/main/resources/assets/openfm/textures/block/speaker_side.png b/common/src/main/resources/assets/openfm/textures/block/speaker_side.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/block/speaker_side.png
rename to common/src/main/resources/assets/openfm/textures/block/speaker_side.png
diff --git a/src/main/resources/assets/openfm/textures/gui/buttons.png b/common/src/main/resources/assets/openfm/textures/gui/buttons.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/gui/buttons.png
rename to common/src/main/resources/assets/openfm/textures/gui/buttons.png
diff --git a/src/main/resources/assets/openfm/textures/gui/gui_radio.png b/common/src/main/resources/assets/openfm/textures/gui/gui_radio.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/gui/gui_radio.png
rename to common/src/main/resources/assets/openfm/textures/gui/gui_radio.png
diff --git a/src/main/resources/assets/openfm/textures/item/memory_card.png b/common/src/main/resources/assets/openfm/textures/item/memory_card.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/item/memory_card.png
rename to common/src/main/resources/assets/openfm/textures/item/memory_card.png
diff --git a/src/main/resources/assets/openfm/textures/item/tuner.png b/common/src/main/resources/assets/openfm/textures/item/tuner.png
similarity index 100%
rename from src/main/resources/assets/openfm/textures/item/tuner.png
rename to common/src/main/resources/assets/openfm/textures/item/tuner.png
diff --git a/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
similarity index 71%
rename from src/main/resources/pack.mcmeta
rename to common/src/main/resources/pack.mcmeta
index 29d0731..76604fd 100644
--- a/src/main/resources/pack.mcmeta
+++ b/common/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 15,
+    "pack_format": 34,
     "description": "OpenFM resources"
   }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
new file mode 100644
index 0000000..9f52fc4
--- /dev/null
+++ b/fabric/build.gradle
@@ -0,0 +1,66 @@
+plugins {
+    id 'multiloader-loader'
+    id 'fabric-loom'
+    id 'net.darkhax.curseforgegradle'
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:${minecraft_version}"
+    mappings loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
+    }
+    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+
+    modCompileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-fabric-api:${cc_tweaked_version}"
+    modRuntimeOnly "cc.tweaked:cc-tweaked-${minecraft_version}-fabric:${cc_tweaked_version}"
+
+    include implementation('javazoom:jlayer:1.0.1')
+    include implementation('com.tianscar.javasound:jaad:0.9.4')
+}
+
+loom {
+    runs {
+        client {
+            client()
+            setConfigName('OpenFM Fabric Client')
+            ideConfigGenerated(true)
+            runDir('runs/client')
+        }
+        server {
+            server()
+            setConfigName('OpenFM Fabric Server')
+            ideConfigGenerated(true)
+            runDir('runs/server')
+        }
+    }
+}
+
+tasks.register('publishCurseForge', net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+    group = 'publishing'
+    description = 'Build and publish the Fabric JAR to CurseForge.'
+
+    def curseForgeToken = providers.gradleProperty('curseforge_token')
+            .orElse(providers.environmentVariable('CURSEFORGE_TOKEN'))
+    def curseForgeProject = providers.gradleProperty('curseforge_project')
+            .orElse(providers.environmentVariable('CURSEFORGE_PROJECT_ID'))
+
+    apiToken = curseForgeToken.orNull
+    def mainFile = upload(curseForgeProject.getOrElse('0'), tasks.named('remapJar'))
+    mainFile.releaseType = providers.gradleProperty('curseforge_release_type').getOrElse('alpha')
+    mainFile.changelog = providers.gradleProperty('curseforge_changelog')
+            .getOrElse("OpenFM ${project.version}")
+    mainFile.addGameVersion(minecraft_version)
+    mainFile.addModLoader('Fabric')
+    mainFile.addEnvironment('Client', 'Server')
+
+    doFirst {
+        if (!curseForgeProject.isPresent()) {
+            throw new GradleException('Missing CurseForge project ID. Set CURSEFORGE_PROJECT_ID or curseforge_project.')
+        }
+        if (!curseForgeToken.isPresent()) {
+            throw new GradleException('Missing CurseForge API token. Set CURSEFORGE_TOKEN or curseforge_token.')
+        }
+    }
+}
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientBridge.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientBridge.java
new file mode 100644
index 0000000..168bf22
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientBridge.java
@@ -0,0 +1,16 @@
+package me.michiyo.openfm.fabric;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+
+@Environment(EnvType.CLIENT)
+final class FabricClientBridge {
+    static void send(CustomPacketPayload payload) {
+        ClientPlayNetworking.send(payload);
+    }
+
+    private FabricClientBridge() {}
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientConfig.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientConfig.java
new file mode 100644
index 0000000..b2f8334
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricClientConfig.java
@@ -0,0 +1,49 @@
+package me.michiyo.openfm.fabric;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+
+final class FabricClientConfig {
+    private static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("openfm-client.properties");
+    private static double volume = loadVolume();
+
+    static synchronized double getVolume() {
+        return volume;
+    }
+
+    static synchronized void setVolume(double value) {
+        volume = Math.max(0.0, Math.min(1.0, value));
+        Properties properties = new Properties();
+        properties.setProperty("radioVolume", Double.toString(volume));
+        try {
+            Files.createDirectories(PATH.getParent());
+            try (OutputStream output = Files.newOutputStream(PATH)) {
+                properties.store(output, "OpenFM client settings");
+            }
+        } catch (IOException exception) {
+            System.err.println("[OpenFM] Could not save Fabric client config: " + exception.getMessage());
+        }
+    }
+
+    private static double loadVolume() {
+        if (!Files.isRegularFile(PATH)) return 1.0;
+        Properties properties = new Properties();
+        try (InputStream input = Files.newInputStream(PATH)) {
+            properties.load(input);
+            return Math.max(0.0, Math.min(1.0,
+                    Double.parseDouble(properties.getProperty("radioVolume", "1.0"))));
+        } catch (IOException | NumberFormatException exception) {
+            System.err.println("[OpenFM] Could not read Fabric client config: " + exception.getMessage());
+            return 1.0;
+        }
+    }
+
+    private FabricClientConfig() {}
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricComputerCraft.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricComputerCraft.java
new file mode 100644
index 0000000..1035e02
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricComputerCraft.java
@@ -0,0 +1,15 @@
+package me.michiyo.openfm.fabric;
+
+import dan200.computercraft.api.peripheral.PeripheralLookup;
+import me.michiyo.openfm.compat.cc.OpenFMRadioPeripheral;
+import me.michiyo.openfm.reg.ModBlockEntities;
+
+final class FabricComputerCraft {
+    static void register() {
+        PeripheralLookup.get().registerForBlockEntity(
+                (radio, side) -> new OpenFMRadioPeripheral(radio), ModBlockEntities.RADIO_BE.get());
+    }
+
+    private FabricComputerCraft() {}
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricNetwork.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricNetwork.java
new file mode 100644
index 0000000..34fb0b0
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricNetwork.java
@@ -0,0 +1,33 @@
+package me.michiyo.openfm.fabric;
+
+import me.michiyo.openfm.net.C2SButtonAction;
+import me.michiyo.openfm.net.C2SLinkSpeaker;
+import me.michiyo.openfm.net.C2SSetFields;
+import me.michiyo.openfm.net.S2CSyncFields;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+
+final class FabricNetwork {
+    static void registerServer() {
+        PayloadTypeRegistry.playC2S().register(C2SButtonAction.TYPE, C2SButtonAction.STREAM_CODEC);
+        PayloadTypeRegistry.playC2S().register(C2SSetFields.TYPE, C2SSetFields.STREAM_CODEC);
+        PayloadTypeRegistry.playC2S().register(C2SLinkSpeaker.TYPE, C2SLinkSpeaker.STREAM_CODEC);
+        PayloadTypeRegistry.playS2C().register(S2CSyncFields.TYPE, S2CSyncFields.STREAM_CODEC);
+
+        ServerPlayNetworking.registerGlobalReceiver(C2SButtonAction.TYPE, (message, context) ->
+                context.server().execute(() -> C2SButtonAction.handle(message, context.player())));
+        ServerPlayNetworking.registerGlobalReceiver(C2SSetFields.TYPE, (message, context) ->
+                context.server().execute(() -> C2SSetFields.handle(message, context.player())));
+        ServerPlayNetworking.registerGlobalReceiver(C2SLinkSpeaker.TYPE, (message, context) ->
+                context.server().execute(() -> C2SLinkSpeaker.handle(message, context.player())));
+    }
+
+    static void registerClient() {
+        ClientPlayNetworking.registerGlobalReceiver(S2CSyncFields.TYPE, (message, context) ->
+                context.client().execute(() -> S2CSyncFields.handle(message)));
+    }
+
+    private FabricNetwork() {}
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricPlatform.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricPlatform.java
new file mode 100644
index 0000000..0caf583
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricPlatform.java
@@ -0,0 +1,42 @@
+package me.michiyo.openfm.fabric;
+
+import me.michiyo.openfm.platform.OpenFMPlatform;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.MenuProvider;
+
+public final class FabricPlatform implements OpenFMPlatform {
+    @Override public String loaderName() { return "Fabric"; }
+    @Override public boolean isModLoaded(String modId) { return FabricLoader.getInstance().isModLoaded(modId); }
+    @Override public boolean isPhysicalClient() {
+        return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
+    }
+    @Override public void sendToServer(CustomPacketPayload payload) { FabricClientBridge.send(payload); }
+    @Override public void sendToPlayer(ServerPlayer player, CustomPacketPayload payload) {
+        ServerPlayNetworking.send(player, payload);
+    }
+    @Override public void sendToTracking(ServerLevel level, BlockPos pos, CustomPacketPayload payload) {
+        PlayerLookup.tracking(level, pos).forEach(player -> ServerPlayNetworking.send(player, payload));
+    }
+    @Override public void openMenu(ServerPlayer player, MenuProvider provider, BlockPos pos) {
+        player.openMenu(new ExtendedScreenHandlerFactory<BlockPos>() {
+            @Override public BlockPos getScreenOpeningData(ServerPlayer player) { return pos; }
+            @Override public net.minecraft.network.chat.Component getDisplayName() { return provider.getDisplayName(); }
+            @Override public net.minecraft.world.inventory.AbstractContainerMenu createMenu(
+                    int id, net.minecraft.world.entity.player.Inventory inventory,
+                    net.minecraft.world.entity.player.Player menuPlayer) {
+                return provider.createMenu(id, inventory, menuPlayer);
+            }
+        });
+    }
+    @Override public double getRadioVolume() { return FabricClientConfig.getVolume(); }
+    @Override public void setRadioVolume(double volume) { FabricClientConfig.setVolume(volume); }
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/FabricRegistrar.java b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricRegistrar.java
new file mode 100644
index 0000000..f3161f4
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/FabricRegistrar.java
@@ -0,0 +1,71 @@
+package me.michiyo.openfm.fabric;
+
+import me.michiyo.openfm.OpenFM;
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.menu.RadioMenu;
+import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
+import java.util.function.Supplier;
+
+final class FabricRegistrar implements OpenFMRegistrar {
+    private static ResourceLocation id(String name) {
+        return ResourceLocation.fromNamespaceAndPath(OpenFM.MODID, name);
+    }
+
+    private static <T> RegistrySupplier<T> fixed(T value) {
+        return () -> value;
+    }
+
+    @Override
+    public RegistrySupplier<Block> registerBlock(String name, Supplier<? extends Block> factory) {
+        return fixed(net.minecraft.core.Registry.register(BuiltInRegistries.BLOCK, id(name), factory.get()));
+    }
+
+    @Override
+    public RegistrySupplier<Item> registerItem(String name, Supplier<? extends Item> factory) {
+        return fixed(net.minecraft.core.Registry.register(BuiltInRegistries.ITEM, id(name), factory.get()));
+    }
+
+    @Override
+    public <T extends BlockEntity> RegistrySupplier<BlockEntityType<T>> registerBlockEntity(
+            String name, BlockEntityFactory<T> factory, RegistrySupplier<? extends Block>... blocks) {
+        Block[] validBlocks = java.util.Arrays.stream(blocks).map(RegistrySupplier::get).toArray(Block[]::new);
+        BlockEntityType<T> type = FabricBlockEntityTypeBuilder.create(factory::create, validBlocks).build();
+        return fixed(net.minecraft.core.Registry.register(BuiltInRegistries.BLOCK_ENTITY_TYPE, id(name), type));
+    }
+
+    @Override
+    public RegistrySupplier<MenuType<RadioMenu>> registerRadioMenu(String name) {
+        MenuType<RadioMenu> type = new ExtendedScreenHandlerType<>(RadioMenu::new, BlockPos.STREAM_CODEC);
+        return fixed(net.minecraft.core.Registry.register(BuiltInRegistries.MENU, id(name), type));
+    }
+
+    @Override
+    public RegistrySupplier<CreativeModeTab> registerCreativeTab(
+            String name,
+            Component title,
+            Supplier<ItemStack> icon,
+            CreativeModeTab.DisplayItemsGenerator displayItems) {
+        CreativeModeTab tab = FabricItemGroup.builder()
+                .title(title)
+                .icon(icon)
+                .displayItems(displayItems)
+                .build();
+        return fixed(net.minecraft.core.Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, id(name), tab));
+    }
+}
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabric.java b/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabric.java
new file mode 100644
index 0000000..3f3de30
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabric.java
@@ -0,0 +1,18 @@
+package me.michiyo.openfm.fabric;
+
+import me.michiyo.openfm.OpenFM;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+
+public final class OpenFMFabric implements ModInitializer {
+    @Override
+    public void onInitialize() {
+        OpenFM.init(new FabricRegistrar());
+        FabricNetwork.registerServer();
+
+        if (FabricLoader.getInstance().isModLoaded("computercraft")) {
+            FabricComputerCraft.register();
+        }
+    }
+}
+
diff --git a/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabricClient.java b/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabricClient.java
new file mode 100644
index 0000000..9a6cc2a
--- /dev/null
+++ b/fabric/src/main/java/me/michiyo/openfm/fabric/OpenFMFabricClient.java
@@ -0,0 +1,26 @@
+package me.michiyo.openfm.fabric;
+
+import me.michiyo.openfm.client.ClientEvents;
+import me.michiyo.openfm.client.OpenFMClient;
+import me.michiyo.openfm.client.render.RadioBlockEntityRenderer;
+import me.michiyo.openfm.client.screen.RadioScreen;
+import me.michiyo.openfm.reg.ModBlockEntities;
+import me.michiyo.openfm.reg.ModMenus;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.fabricmc.fabric.api.client.screen.v1.Screens;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
+import net.minecraft.client.gui.screens.MenuScreens;
+
+public final class OpenFMFabricClient implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        BlockEntityRendererRegistry.register(ModBlockEntities.RADIO_BE.get(), RadioBlockEntityRenderer::new);
+        MenuScreens.register(ModMenus.RADIO_MENU.get(), RadioScreen::new);
+        FabricNetwork.registerClient();
+        ClientTickEvents.END_CLIENT_TICK.register(client -> ClientEvents.clientTick());
+        ScreenEvents.AFTER_INIT.register((client, screen, width, height) ->
+                OpenFMClient.addSettingsButton(screen, button -> Screens.getButtons(screen).add(button)));
+    }
+}
diff --git a/fabric/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform b/fabric/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform
new file mode 100644
index 0000000..07fb291
--- /dev/null
+++ b/fabric/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform
@@ -0,0 +1,2 @@
+me.michiyo.openfm.fabric.FabricPlatform
+
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
new file mode 100644
index 0000000..d8cc66e
--- /dev/null
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -0,0 +1,23 @@
+{
+  "schemaVersion": 1,
+  "id": "${mod_id}",
+  "version": "${version}",
+  "name": "${mod_name}",
+  "description": "${description}",
+  "authors": ["${mod_author}"],
+  "license": "${license}",
+  "environment": "*",
+  "entrypoints": {
+    "main": ["me.michiyo.openfm.fabric.OpenFMFabric"],
+    "client": ["me.michiyo.openfm.fabric.OpenFMFabricClient"]
+  },
+  "depends": {
+    "fabricloader": ">=${fabric_loader_version}",
+    "fabric-api": "*",
+    "minecraft": "${minecraft_version}",
+    "java": ">=${java_version}"
+  },
+  "suggests": {
+    "computercraft": ">=${cc_tweaked_min_version}"
+  }
+}
diff --git a/gradle.properties b/gradle.properties
index 1edb7f3..417cb90 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,29 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-minecraft_version=1.20.1
-forge_version=47.3.0
+
+version=0.0.1
+group=me.michiyo
+java_version=21
+
+minecraft_version=1.21.1
+minecraft_version_range=[1.21.1,1.22)
 mod_id=openfm
 mod_name=OpenFM
-mod_version=0.0.1
-mod_group=me.michiyo
-mod_authors=Caitlyn
+mod_author=Caitlyn
+license=MIT
+credits=
+description=Internet radio streaming for Minecraft.
+
+neo_form_version=1.21.1-20240808.144430
+parchment_minecraft=1.21
+parchment_version=2024.11.10
+
+fabric_version=0.110.0+1.21.1
+fabric_loader_version=0.16.9
+
+neoforge_version=21.1.235
+neoforge_loader_version_range=[4,)
+
+cc_tweaked_version=1.113.1
+cc_tweaked_neoforge_version=1.120.0
+cc_tweaked_min_version=1.113.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2617362..707e499 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
new file mode 100644
index 0000000..d4ade45
--- /dev/null
+++ b/neoforge/build.gradle
@@ -0,0 +1,60 @@
+plugins {
+    id 'multiloader-loader'
+    id 'net.neoforged.moddev'
+    id 'net.darkhax.curseforgegradle'
+}
+
+neoForge {
+    version = neoforge_version
+    parchment {
+        minecraftVersion = parchment_minecraft
+        mappingsVersion = parchment_version
+    }
+    runs {
+        configureEach {
+            ideName = "OpenFM NeoForge ${it.name.capitalize()}"
+        }
+        client { client() }
+        server { server() }
+    }
+    mods {
+        "${mod_id}" { sourceSet sourceSets.main }
+    }
+}
+
+dependencies {
+    compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-core-api:${cc_tweaked_neoforge_version}"
+    compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cc_tweaked_neoforge_version}"
+    runtimeOnly "cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_tweaked_neoforge_version}"
+
+    jarJar(implementation('javazoom:jlayer:[1.0.1]')) { version { prefer '1.0.1' } }
+    jarJar(implementation('com.tianscar.javasound:jaad:[0.9.4]')) { version { prefer '0.9.4' } }
+}
+
+tasks.register('publishCurseForge', net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+    group = 'publishing'
+    description = 'Build and publish the NeoForge JAR to CurseForge.'
+
+    def curseForgeToken = providers.gradleProperty('curseforge_token')
+            .orElse(providers.environmentVariable('CURSEFORGE_TOKEN'))
+    def curseForgeProject = providers.gradleProperty('curseforge_project')
+            .orElse(providers.environmentVariable('CURSEFORGE_PROJECT_ID'))
+
+    apiToken = curseForgeToken.orNull
+    def mainFile = upload(curseForgeProject.getOrElse('0'), tasks.named('jar'))
+    mainFile.releaseType = providers.gradleProperty('curseforge_release_type').getOrElse('alpha')
+    mainFile.changelog = providers.gradleProperty('curseforge_changelog')
+            .getOrElse("OpenFM ${project.version}")
+    mainFile.addGameVersion(minecraft_version)
+    mainFile.addModLoader('NeoForge')
+    mainFile.addEnvironment('Client', 'Server')
+
+    doFirst {
+        if (!curseForgeProject.isPresent()) {
+            throw new GradleException('Missing CurseForge project ID. Set CURSEFORGE_PROJECT_ID or curseforge_project.')
+        }
+        if (!curseForgeToken.isPresent()) {
+            throw new GradleException('Missing CurseForge API token. Set CURSEFORGE_TOKEN or curseforge_token.')
+        }
+    }
+}
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientConfig.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientConfig.java
new file mode 100644
index 0000000..0240152
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientConfig.java
@@ -0,0 +1,21 @@
+package me.michiyo.openfm.neoforge;
+
+import net.neoforged.neoforge.common.ModConfigSpec;
+
+final class NeoForgeClientConfig {
+    static final ModConfigSpec SPEC;
+    static final ModConfigSpec.DoubleValue RADIO_VOLUME;
+
+    static {
+        ModConfigSpec.Builder builder = new ModConfigSpec.Builder();
+        builder.push("audio");
+        RADIO_VOLUME = builder
+                .comment("Per-client OpenFM radio volume multiplier.", "0.0 = mute, 1.0 = full volume.")
+                .defineInRange("radioVolume", 1.0d, 0.0d, 1.0d);
+        builder.pop();
+        SPEC = builder.build();
+    }
+
+    private NeoForgeClientConfig() {}
+}
+
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientEvents.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientEvents.java
new file mode 100644
index 0000000..9c0e624
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeClientEvents.java
@@ -0,0 +1,44 @@
+package me.michiyo.openfm.neoforge;
+
+import me.michiyo.openfm.client.ClientEvents;
+import me.michiyo.openfm.client.OpenFMClient;
+import me.michiyo.openfm.client.render.RadioBlockEntityRenderer;
+import me.michiyo.openfm.client.screen.RadioScreen;
+import me.michiyo.openfm.reg.ModBlockEntities;
+import me.michiyo.openfm.reg.ModMenus;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
+import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
+import net.neoforged.neoforge.client.event.ScreenEvent;
+import net.neoforged.neoforge.common.NeoForge;
+
+final class NeoForgeClientEvents {
+    static void register(IEventBus modBus) {
+        modBus.addListener(NeoForgeClientEvents::clientSetup);
+        modBus.addListener(NeoForgeClientEvents::registerScreens);
+        NeoForge.EVENT_BUS.addListener(NeoForgeClientEvents::clientTick);
+        NeoForge.EVENT_BUS.addListener(NeoForgeClientEvents::screenInit);
+    }
+
+    private static void clientSetup(FMLClientSetupEvent event) {
+        event.enqueueWork(() -> BlockEntityRenderers.register(
+                ModBlockEntities.RADIO_BE.get(), RadioBlockEntityRenderer::new));
+    }
+
+    private static void registerScreens(RegisterMenuScreensEvent event) {
+        event.register(ModMenus.RADIO_MENU.get(), RadioScreen::new);
+    }
+
+    private static void clientTick(ClientTickEvent.Post event) {
+        ClientEvents.clientTick();
+    }
+
+    private static void screenInit(ScreenEvent.Init.Post event) {
+        OpenFMClient.addSettingsButton(event.getScreen(), event::addListener);
+    }
+
+    private NeoForgeClientEvents() {}
+}
+
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeComputerCraft.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeComputerCraft.java
new file mode 100644
index 0000000..959c9e4
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeComputerCraft.java
@@ -0,0 +1,16 @@
+package me.michiyo.openfm.neoforge;
+
+import dan200.computercraft.api.peripheral.PeripheralCapability;
+import me.michiyo.openfm.compat.cc.OpenFMRadioPeripheral;
+import me.michiyo.openfm.reg.ModBlockEntities;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
+
+final class NeoForgeComputerCraft {
+    static void register(RegisterCapabilitiesEvent event) {
+        event.registerBlockEntity(PeripheralCapability.get(), ModBlockEntities.RADIO_BE.get(),
+                (radio, side) -> new OpenFMRadioPeripheral(radio));
+    }
+
+    private NeoForgeComputerCraft() {}
+}
+
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeNetwork.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeNetwork.java
new file mode 100644
index 0000000..d88fcc4
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeNetwork.java
@@ -0,0 +1,28 @@
+package me.michiyo.openfm.neoforge;
+
+import me.michiyo.openfm.net.C2SButtonAction;
+import me.michiyo.openfm.net.C2SLinkSpeaker;
+import me.michiyo.openfm.net.C2SSetFields;
+import me.michiyo.openfm.net.S2CSyncFields;
+import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+
+final class NeoForgeNetwork {
+    static void register(RegisterPayloadHandlersEvent event) {
+        var registrar = event.registrar("1");
+        registrar.playToServer(C2SButtonAction.TYPE, C2SButtonAction.STREAM_CODEC,
+                (message, context) -> context.enqueueWork(() ->
+                        C2SButtonAction.handle(message, (ServerPlayer) context.player())));
+        registrar.playToServer(C2SSetFields.TYPE, C2SSetFields.STREAM_CODEC,
+                (message, context) -> context.enqueueWork(() ->
+                        C2SSetFields.handle(message, (ServerPlayer) context.player())));
+        registrar.playToServer(C2SLinkSpeaker.TYPE, C2SLinkSpeaker.STREAM_CODEC,
+                (message, context) -> context.enqueueWork(() ->
+                        C2SLinkSpeaker.handle(message, (ServerPlayer) context.player())));
+        registrar.playToClient(S2CSyncFields.TYPE, S2CSyncFields.STREAM_CODEC,
+                (message, context) -> context.enqueueWork(() -> S2CSyncFields.handle(message)));
+    }
+
+    private NeoForgeNetwork() {}
+}
+
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgePlatform.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgePlatform.java
new file mode 100644
index 0000000..fdaa54a
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgePlatform.java
@@ -0,0 +1,31 @@
+package me.michiyo.openfm.neoforge;
+
+import me.michiyo.openfm.platform.OpenFMPlatform;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.MenuProvider;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.network.PacketDistributor;
+
+public final class NeoForgePlatform implements OpenFMPlatform {
+    @Override public String loaderName() { return "NeoForge"; }
+    @Override public boolean isModLoaded(String modId) { return ModList.get().isLoaded(modId); }
+    @Override public boolean isPhysicalClient() { return FMLEnvironment.dist == Dist.CLIENT; }
+    @Override public void sendToServer(CustomPacketPayload payload) { PacketDistributor.sendToServer(payload); }
+    @Override public void sendToPlayer(ServerPlayer player, CustomPacketPayload payload) {
+        PacketDistributor.sendToPlayer(player, payload);
+    }
+    @Override public void sendToTracking(ServerLevel level, BlockPos pos, CustomPacketPayload payload) {
+        PacketDistributor.sendToPlayersTrackingChunk(level, level.getChunkAt(pos).getPos(), payload);
+    }
+    @Override public void openMenu(ServerPlayer player, MenuProvider provider, BlockPos pos) {
+        player.openMenu(provider, buffer -> buffer.writeBlockPos(pos));
+    }
+    @Override public double getRadioVolume() { return NeoForgeClientConfig.RADIO_VOLUME.get(); }
+    @Override public void setRadioVolume(double volume) { NeoForgeClientConfig.RADIO_VOLUME.set(volume); }
+}
+
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeRegistrar.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeRegistrar.java
new file mode 100644
index 0000000..266444d
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/NeoForgeRegistrar.java
@@ -0,0 +1,82 @@
+package me.michiyo.openfm.neoforge;
+
+import me.michiyo.openfm.OpenFM;
+import me.michiyo.openfm.platform.OpenFMRegistrar;
+import me.michiyo.openfm.platform.RegistrySupplier;
+import me.michiyo.openfm.world.menu.RadioMenu;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.common.extensions.IMenuTypeExtension;
+import net.neoforged.neoforge.registries.DeferredRegister;
+
+import java.util.function.Supplier;
+
+final class NeoForgeRegistrar implements OpenFMRegistrar {
+    private final DeferredRegister.Blocks blocks = DeferredRegister.createBlocks(OpenFM.MODID);
+    private final DeferredRegister.Items items = DeferredRegister.createItems(OpenFM.MODID);
+    private final DeferredRegister<BlockEntityType<?>> blockEntities =
+            DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, OpenFM.MODID);
+    private final DeferredRegister<MenuType<?>> menus = DeferredRegister.create(Registries.MENU, OpenFM.MODID);
+    private final DeferredRegister<CreativeModeTab> tabs =
+            DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OpenFM.MODID);
+
+    @Override
+    public RegistrySupplier<Block> registerBlock(String name, Supplier<? extends Block> factory) {
+        var holder = blocks.register(name, factory);
+        return holder::get;
+    }
+
+    @Override
+    public RegistrySupplier<Item> registerItem(String name, Supplier<? extends Item> factory) {
+        var holder = items.register(name, factory);
+        return holder::get;
+    }
+
+    @Override
+    public <T extends BlockEntity> RegistrySupplier<BlockEntityType<T>> registerBlockEntity(
+            String name, BlockEntityFactory<T> factory, RegistrySupplier<? extends Block>... blocks) {
+        var holder = blockEntities.register(name, () -> {
+            Block[] validBlocks = java.util.Arrays.stream(blocks)
+                    .map(RegistrySupplier::get)
+                    .toArray(Block[]::new);
+            return BlockEntityType.Builder.of(factory::create, validBlocks).build(null);
+        });
+        return holder::get;
+    }
+
+    @Override
+    public RegistrySupplier<MenuType<RadioMenu>> registerRadioMenu(String name) {
+        var holder = menus.register(name, () -> IMenuTypeExtension.create(RadioMenu::new));
+        return holder::get;
+    }
+
+    @Override
+    public RegistrySupplier<CreativeModeTab> registerCreativeTab(
+            String name,
+            Component title,
+            Supplier<ItemStack> icon,
+            CreativeModeTab.DisplayItemsGenerator displayItems) {
+        var holder = tabs.register(name, () -> CreativeModeTab.builder()
+                .title(title)
+                .icon(icon)
+                .displayItems(displayItems)
+                .build());
+        return holder::get;
+    }
+
+    void bind(IEventBus bus) {
+        blocks.register(bus);
+        items.register(bus);
+        blockEntities.register(bus);
+        menus.register(bus);
+        tabs.register(bus);
+    }
+}
diff --git a/neoforge/src/main/java/me/michiyo/openfm/neoforge/OpenFMNeoForge.java b/neoforge/src/main/java/me/michiyo/openfm/neoforge/OpenFMNeoForge.java
new file mode 100644
index 0000000..5680322
--- /dev/null
+++ b/neoforge/src/main/java/me/michiyo/openfm/neoforge/OpenFMNeoForge.java
@@ -0,0 +1,30 @@
+package me.michiyo.openfm.neoforge;
+
+import me.michiyo.openfm.OpenFM;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.fml.loading.FMLEnvironment;
+
+@Mod(OpenFM.MODID)
+public final class OpenFMNeoForge {
+    public OpenFMNeoForge(IEventBus modBus, ModContainer modContainer) {
+        NeoForgeRegistrar registrar = new NeoForgeRegistrar();
+        OpenFM.init(registrar);
+        registrar.bind(modBus);
+
+        modContainer.registerConfig(ModConfig.Type.CLIENT, NeoForgeClientConfig.SPEC);
+        modBus.addListener(NeoForgeNetwork::register);
+
+        if (ModList.get().isLoaded("computercraft")) {
+            modBus.addListener(NeoForgeComputerCraft::register);
+        }
+        if (FMLEnvironment.dist == Dist.CLIENT) {
+            NeoForgeClientEvents.register(modBus);
+        }
+    }
+}
+
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
new file mode 100644
index 0000000..0c80a13
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -0,0 +1,31 @@
+modLoader="javafml"
+loaderVersion="${neoforge_loader_version_range}"
+license="${license}"
+
+[[mods]]
+modId="${mod_id}"
+version="${version}"
+displayName="${mod_name}"
+authors="${mod_author}"
+description='''${description}'''
+
+[[dependencies.${mod_id}]]
+modId="neoforge"
+type="required"
+versionRange="[${neoforge_version},)"
+ordering="NONE"
+side="BOTH"
+
+[[dependencies.${mod_id}]]
+modId="minecraft"
+type="required"
+versionRange="${minecraft_version_range}"
+ordering="NONE"
+side="BOTH"
+
+[[dependencies.${mod_id}]]
+modId="computercraft"
+type="optional"
+versionRange="[${cc_tweaked_min_version},)"
+ordering="AFTER"
+side="BOTH"
diff --git a/neoforge/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform b/neoforge/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform
new file mode 100644
index 0000000..529c809
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/services/me.michiyo.openfm.platform.OpenFMPlatform
@@ -0,0 +1 @@
+me.michiyo.openfm.neoforge.NeoForgePlatform
diff --git a/settings.gradle b/settings.gradle
index 5e9f853..3a39e8a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,36 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'Fabric'
+                    url = uri('https://maven.fabricmc.net')
+                }
+            }
+            filter {
+                includeGroup('net.fabricmc')
+                includeGroup('fabric-loom')
+            }
+        }
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'Sponge'
+                    url = uri('https://repo.spongepowered.org/repository/maven-public')
+                }
+            }
+            filter { includeGroupAndSubgroups('org.spongepowered') }
+        }
     }
 }
 
-rootProject.name = 'openfm'
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
+rootProject.name = 'OpenFM'
+include('common')
+include('fabric')
+include('neoforge')
diff --git a/src/main/java/me/michiyo/openfm/OpenFM.java b/src/main/java/me/michiyo/openfm/OpenFM.java
deleted file mode 100644
index 79b71db..0000000
--- a/src/main/java/me/michiyo/openfm/OpenFM.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package me.michiyo.openfm;
-
-import me.michiyo.openfm.config.OpenFMClientConfig;
-import me.michiyo.openfm.net.Net;
-import me.michiyo.openfm.reg.ModBlockEntities;
-import me.michiyo.openfm.reg.ModBlocks;
-import me.michiyo.openfm.reg.ModItems;
-import me.michiyo.openfm.reg.ModMenus;
-import me.michiyo.openfm.reg.ModCreativeTabs;
-
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-
-@Mod(OpenFM.MODID)
-public class OpenFM {
-    public static final String MODID = "openfm";
-
-    public OpenFM() {
-        IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
-
-        ModBlocks.REG.register(bus);
-        ModItems.REG.register(bus);
-        ModBlockEntities.REG.register(bus);
-        ModMenus.REG.register(bus);
-        ModCreativeTabs.REG.register(bus);
-
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, OpenFMClientConfig.SPEC);
-
-        Net.register();
-
-        if (ModList.get().isLoaded("computercraft")) {
-            MinecraftForge.EVENT_BUS.addGenericListener(BlockEntity.class,
-                    me.michiyo.openfm.compat.cc.ComputerCraftCompat::attachPeripherals
-            );
-        }
-    }
-}
diff --git a/src/main/java/me/michiyo/openfm/client/ClientForgeEvents.java b/src/main/java/me/michiyo/openfm/client/ClientForgeEvents.java
deleted file mode 100644
index f179176..0000000
--- a/src/main/java/me/michiyo/openfm/client/ClientForgeEvents.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.michiyo.openfm.client;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.client.audio.RadioStreamManager;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(modid = OpenFM.MODID, value = Dist.CLIENT) // FORGE bus (default)
-public final class ClientForgeEvents {
-
-    @SubscribeEvent
-    public static void onClientTick(TickEvent.ClientTickEvent e) {
-        if (e.phase != TickEvent.Phase.END) return;
-        RadioStreamManager.clientTick();
-    }
-
-    private ClientForgeEvents() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/client/ClientModEvents.java b/src/main/java/me/michiyo/openfm/client/ClientModEvents.java
deleted file mode 100644
index 886cc6e..0000000
--- a/src/main/java/me/michiyo/openfm/client/ClientModEvents.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.michiyo.openfm.client;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.client.screen.RadioScreen;
-import me.michiyo.openfm.reg.ModBlockEntities;
-import me.michiyo.openfm.reg.ModMenus;
-import me.michiyo.openfm.client.render.RadioBlockEntityRenderer;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraft.client.gui.screens.MenuScreens;
-
-@Mod.EventBusSubscriber(modid = OpenFM.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-public final class ClientModEvents {
-
-    @SubscribeEvent
-    public static void onClientSetup(FMLClientSetupEvent e) {
-        e.enqueueWork(() -> {
-            MenuScreens.register(ModMenus.RADIO_MENU.get(), RadioScreen::new);
-
-            // Block Entity Renderer (screen text)
-            BlockEntityRenderers.register(ModBlockEntities.RADIO_BE.get(), RadioBlockEntityRenderer::new);
-        });
-    }
-
-
-    private ClientModEvents() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/client/OpenFMClient.java b/src/main/java/me/michiyo/openfm/client/OpenFMClient.java
deleted file mode 100644
index 579eab6..0000000
--- a/src/main/java/me/michiyo/openfm/client/OpenFMClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package me.michiyo.openfm.client;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.client.screen.OpenFMAudioSettingsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.OptionsScreen;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(modid = OpenFM.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE)
-public final class OpenFMClient {
-
-    @SubscribeEvent
-    public static void onScreenInit(ScreenEvent.Init.Post event) {
-        if (!(event.getScreen() instanceof OptionsScreen optionsScreen)) return;
-
-        // Place it near the bottom; tweak to taste.
-        int x = event.getScreen().width / 2 - 155;
-        int y = event.getScreen().height - 27;
-
-        Button btn = Button.builder(Component.literal("OpenFM Audio..."), b -> {
-            Minecraft.getInstance().setScreen(new OpenFMAudioSettingsScreen(optionsScreen));
-        }).bounds(x, y, 150, 20).build();
-
-        event.addListener(btn);
-    }
-
-    private OpenFMClient() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/compat/cc/ComputerCraftCompat.java b/src/main/java/me/michiyo/openfm/compat/cc/ComputerCraftCompat.java
deleted file mode 100644
index 5b24dbb..0000000
--- a/src/main/java/me/michiyo/openfm/compat/cc/ComputerCraftCompat.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package me.michiyo.openfm.compat.cc;
-
-import dan200.computercraft.api.peripheral.IPeripheral;
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.world.be.RadioBlockEntity;
-import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.common.capabilities.CapabilityToken;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.common.util.NonNullSupplier;
-import net.minecraftforge.event.AttachCapabilitiesEvent;
-
-import javax.annotation.Nullable;
-
-public final class ComputerCraftCompat {
-    private ComputerCraftCompat() {}
-
-    public static final Capability<IPeripheral> CAPABILITY_PERIPHERAL =
-            CapabilityManager.get(new CapabilityToken<>() {});
-
-    private static final ResourceLocation KEY =
-            new ResourceLocation(OpenFM.MODID, "computercraft_peripheral");
-
-    public static void attachPeripherals(AttachCapabilitiesEvent<BlockEntity> event) {
-        BlockEntity be = event.getObject();
-        if (!(be instanceof RadioBlockEntity radio)) return;
-
-        PeripheralProvider provider = new PeripheralProvider(() -> new OpenFMRadioPeripheral(radio));
-        event.addCapability(KEY, provider);
-        event.addListener(provider::invalidate);
-    }
-
-    private static final class PeripheralProvider implements ICapabilityProvider {
-        private final NonNullSupplier<IPeripheral> factory;
-        private @Nullable LazyOptional<IPeripheral> cached;
-
-        private PeripheralProvider(NonNullSupplier<IPeripheral> factory) {
-            this.factory = factory;
-        }
-
-        private void invalidate() {
-            if (cached != null) cached.invalidate();
-            cached = null;
-        }
-
-        @Override
-        public <T> LazyOptional<T> getCapability(Capability<T> capability, @Nullable Direction side) {
-            if (capability != CAPABILITY_PERIPHERAL) return LazyOptional.empty();
-
-            LazyOptional<IPeripheral> cur = cached;
-            if (cur == null) {
-                cur = LazyOptional.of(factory);
-                cached = cur;
-            }
-            return cur.cast();
-        }
-    }
-}
diff --git a/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java b/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java
deleted file mode 100644
index 211c19e..0000000
--- a/src/main/java/me/michiyo/openfm/config/OpenFMClientConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.michiyo.openfm.config;
-
-import net.minecraftforge.common.ForgeConfigSpec;
-
-public final class OpenFMClientConfig {
-    public static final ForgeConfigSpec SPEC;
-
-    public static final ForgeConfigSpec.DoubleValue RADIO_VOLUME; // 0.0..1.0
-
-    static {
-        ForgeConfigSpec.Builder b = new ForgeConfigSpec.Builder();
-
-        b.push("audio");
-
-        RADIO_VOLUME = b
-                .comment("Per-client OpenFM radio volume multiplier (independent of Minecraft Music).",
-                        "Applied on top of block volume + distance attenuation.",
-                        "0.0 = mute, 1.0 = full volume.")
-                .defineInRange("radioVolume", 1.0d, 0.0d, 1.0d);
-
-        b.pop();
-
-        SPEC = b.build();
-    }
-
-    private OpenFMClientConfig() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/events/CreativeTabEvents.java b/src/main/java/me/michiyo/openfm/events/CreativeTabEvents.java
deleted file mode 100644
index 029c943..0000000
--- a/src/main/java/me/michiyo/openfm/events/CreativeTabEvents.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.michiyo.openfm.events;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.reg.ModCreativeTabs;
-import me.michiyo.openfm.reg.ModItems;
-import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(modid = OpenFM.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public final class CreativeTabEvents {
-
-    @SubscribeEvent
-    public static void onBuildTabContents(BuildCreativeModeTabContentsEvent e) {
-        if (e.getTab() == ModCreativeTabs.OPENFM_TAB.get()) {
-            e.accept(ModItems.RADIO_BLOCK_ITEM.get());
-            e.accept(ModItems.MEMORY_CARD.get());
-        }
-    }
-
-    private CreativeTabEvents() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/net/Net.java b/src/main/java/me/michiyo/openfm/net/Net.java
deleted file mode 100644
index 9213d61..0000000
--- a/src/main/java/me/michiyo/openfm/net/Net.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package me.michiyo.openfm.net;
-
-import me.michiyo.openfm.OpenFM;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.network.NetworkDirection;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
-
-public final class Net {
-    private static final String PROTOCOL = "1";
-    public static final SimpleChannel CH = NetworkRegistry.newSimpleChannel(
-            new ResourceLocation(OpenFM.MODID, "main"),
-            () -> PROTOCOL,
-            PROTOCOL::equals,
-            PROTOCOL::equals
-    );
-
-    private static int id = 0;
-
-    public static void register() {
-        // C2S
-        CH.messageBuilder(C2SButtonAction.class, id++, NetworkDirection.PLAY_TO_SERVER)
-                .encoder(C2SButtonAction::encode)
-                .decoder(C2SButtonAction::decode)
-                .consumerMainThread(C2SButtonAction::handle)
-                .add();
-
-        CH.messageBuilder(C2SSetFields.class, id++, NetworkDirection.PLAY_TO_SERVER)
-                .encoder(C2SSetFields::encode)
-                .decoder(C2SSetFields::decode)
-                .consumerMainThread(C2SSetFields::handle)
-                .add();
-
-        // NEW: Speaker link/unlink
-        CH.messageBuilder(C2SLinkSpeaker.class, id++, NetworkDirection.PLAY_TO_SERVER)
-                .encoder(C2SLinkSpeaker::encode)
-                .decoder(C2SLinkSpeaker::decode)
-                .consumerMainThread(C2SLinkSpeaker::handle)
-                .add();
-
-        // S2C (THIS is the one that makes your color/text/url sync work)
-        CH.messageBuilder(S2CSyncFields.class, id++, NetworkDirection.PLAY_TO_CLIENT)
-                .encoder(S2CSyncFields::encode)
-                .decoder(S2CSyncFields::decode)
-                .consumerMainThread(S2CSyncFields::handle)
-                .add();
-    }
-
-    private Net() {}
-}
diff --git a/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java b/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java
deleted file mode 100644
index 2be0f02..0000000
--- a/src/main/java/me/michiyo/openfm/reg/ModBlockEntities.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.michiyo.openfm.reg;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.world.be.RadioBlockEntity;
-import me.michiyo.openfm.world.be.SpeakerBlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-
-public class ModBlockEntities {
-    public static final DeferredRegister<BlockEntityType<?>> REG =
-            DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, OpenFM.MODID);
-
-    public static final RegistryObject<BlockEntityType<RadioBlockEntity>> RADIO_BE = REG.register("radio_be",
-            () -> BlockEntityType.Builder.of(RadioBlockEntity::new, ModBlocks.RADIO_BLOCK.get()).build(null)
-    );
-
-    public static final RegistryObject<BlockEntityType<SpeakerBlockEntity>> SPEAKER_BE = REG.register("speaker_be",
-            () -> BlockEntityType.Builder.of(SpeakerBlockEntity::new, ModBlocks.SPEAKER_BLOCK.get()).build(null)
-    );
-}
diff --git a/src/main/java/me/michiyo/openfm/reg/ModBlocks.java b/src/main/java/me/michiyo/openfm/reg/ModBlocks.java
deleted file mode 100644
index 0b0bf6f..0000000
--- a/src/main/java/me/michiyo/openfm/reg/ModBlocks.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package me.michiyo.openfm.reg;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.world.block.RadioBlock;
-import me.michiyo.openfm.world.block.SpeakerBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.MapColor;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-
-public class ModBlocks {
-    public static final DeferredRegister<Block> REG = DeferredRegister.create(ForgeRegistries.BLOCKS, OpenFM.MODID);
-
-    public static final RegistryObject<Block> RADIO_BLOCK = REG.register("radio_block",
-            () -> new RadioBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F).requiresCorrectToolForDrops())
-    );
-
-    public static final RegistryObject<Block> SPEAKER_BLOCK = REG.register("speaker_block",
-            () -> new SpeakerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F).requiresCorrectToolForDrops())
-    );
-}
diff --git a/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java b/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java
deleted file mode 100644
index aaedc37..0000000
--- a/src/main/java/me/michiyo/openfm/reg/ModCreativeTabs.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.michiyo.openfm.reg;
-
-import me.michiyo.openfm.OpenFM;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.RegistryObject;
-
-public class ModCreativeTabs {
-    public static final DeferredRegister<CreativeModeTab> REG =
-            DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OpenFM.MODID);
-
-    public static final RegistryObject<CreativeModeTab> OPENFM_TAB = REG.register("openfm", () ->
-            CreativeModeTab.builder()
-                    .title(Component.literal("OpenFM"))
-                    .icon(() -> new ItemStack(ModItems.RADIO_BLOCK_ITEM.get()))
-                    .displayItems((params, output) -> {
-                        output.accept(ModItems.RADIO_BLOCK_ITEM.get());
-                        output.accept(ModItems.SPEAKER_BLOCK_ITEM.get());
-                        output.accept(ModItems.TUNER.get());
-                    })
-                    .build()
-    );
-}
diff --git a/src/main/java/me/michiyo/openfm/reg/ModItems.java b/src/main/java/me/michiyo/openfm/reg/ModItems.java
deleted file mode 100644
index ab5cb03..0000000
--- a/src/main/java/me/michiyo/openfm/reg/ModItems.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package me.michiyo.openfm.reg;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.world.item.OpenFMTunerItem;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-
-public class ModItems {
-    public static final DeferredRegister<Item> REG = DeferredRegister.create(ForgeRegistries.ITEMS, OpenFM.MODID);
-
-    public static final RegistryObject<Item> RADIO_BLOCK_ITEM = REG.register("radio_block",
-            () -> new BlockItem(ModBlocks.RADIO_BLOCK.get(), new Item.Properties())
-    );
-
-    public static final RegistryObject<Item> SPEAKER_BLOCK_ITEM = REG.register("speaker_block",
-            () -> new BlockItem(ModBlocks.SPEAKER_BLOCK.get(), new Item.Properties())
-    );
-
-    public static final RegistryObject<Item> MEMORY_CARD = REG.register("memory_card",
-            () -> new Item(new Item.Properties().stacksTo(1))
-    );
-
-    public static final RegistryObject<Item> TUNER = REG.register("tuner",
-           () -> new OpenFMTunerItem(new Item.Properties().stacksTo(1))
-    );
-}
diff --git a/src/main/java/me/michiyo/openfm/reg/ModMenus.java b/src/main/java/me/michiyo/openfm/reg/ModMenus.java
deleted file mode 100644
index e36a539..0000000
--- a/src/main/java/me/michiyo/openfm/reg/ModMenus.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.michiyo.openfm.reg;
-
-import me.michiyo.openfm.OpenFM;
-import me.michiyo.openfm.world.menu.RadioMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraftforge.common.extensions.IForgeMenuType;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-
-public class ModMenus {
-    public static final DeferredRegister<MenuType<?>> REG =
-            DeferredRegister.create(ForgeRegistries.MENU_TYPES, OpenFM.MODID);
-
-    public static final RegistryObject<MenuType<RadioMenu>> RADIO_MENU =
-            REG.register("radio_menu", () -> IForgeMenuType.create(RadioMenu::new));
-}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
deleted file mode 100644
index 359bd7f..0000000
--- a/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-modLoader="javafml"
-loaderVersion="[47,)"
-license="MIT"
-
-[[mods]]
-modId="openfm"
-version="${file.jarVersion}"
-displayName="OpenFM"
-authors="Caitlyn"
-description="Streaming radio block + speakers."
-
-[[dependencies.openfm]]
-modId="forge"
-mandatory=true
-versionRange="[47,)"
-ordering="NONE"
-side="BOTH"
-
-[[dependencies.openfm]]
-modId="minecraft"
-mandatory=true
-versionRange="[1.20.1]"
-ordering="NONE"
-side="BOTH"