From 6aba8d98ff4ce597c16d36451d38483db982b365 Mon Sep 17 00:00:00 2001
From: lqdev <liquidev@tutanota.com>
Date: Sun, 20 Nov 2022 23:06:55 +0100
Subject: [PATCH] ports

---
 build.gradle.kts                              |  27 ++++-
 d3r/Cargo.lock                                |   7 ++
 d3r/Cargo.toml                                |   1 +
 d3r/src/lib.rs                                |   3 +
 proj/block/module_generic.ase                 | Bin 614 -> 0 bytes
 proj/block/speaker_front.ase                  | Bin 627 -> 884 bytes
 proj/block/speaker_side.ase                   | Bin 0 -> 445 bytes
 proj/device/port.ase                          | Bin 0 -> 324 bytes
 .../f3798f81c7b6fecad2cbfec741314f8a66c0eca3  |   4 +
 .../assets/dawd3/blockstates/speaker.json     |  19 ++++
 .../assets/dawd3/models/block/speaker.json    |  73 +++++++++++++
 .../assets/dawd3/models/item/speaker.json     |   0
 .../net/liquidev/d3r/AudioOutputStream.java   |   2 +-
 src/main/java/net/liquidev/d3r/D3r.java       |   2 +-
 .../kotlin/net/liquidev/dawd3/D3Registry.kt   |   4 +-
 src/main/kotlin/net/liquidev/dawd3/Mod.kt     |  24 +++--
 .../kotlin/net/liquidev/dawd3/audio/Audio.kt  |  37 +++++++
 .../net/liquidev/dawd3/audio/AudioBuffer.kt   |  23 ++++
 .../net/liquidev/dawd3/audio/device/Device.kt |   9 ++
 .../dawd3/audio/device/DeviceInstance.kt      |  33 ++++++
 .../liquidev/dawd3/audio/device/Devices.kt    |  53 ++++++++++
 .../net/liquidev/dawd3/audio/device/Sim.kt    |  45 ++++++++
 .../liquidev/dawd3/audio/device/exceptions.kt |   5 +
 .../net/liquidev/dawd3/audio/device/ports.kt  |  38 +++++++
 .../dawd3/audio/devices/ConstantDevice.kt     |  22 ++++
 .../audio/devices/SineOscillatorDevice.kt     |  39 +++++++
 .../dawd3/audio/devices/TerminalDevice.kt     |  21 ++++
 .../dawd3/audio/generator/AudioGenerator.kt   |  30 ++++++
 .../audio/generator/DeviceGraphGenerator.kt   |  28 +++++
 .../dawd3/audio/generator/MixGenerator.kt     |  89 ++++++++++++++++
 .../generator}/SineOscGenerator.kt            |  12 ++-
 .../net/liquidev/dawd3/audio/unit/volume.kt   |  14 +++
 .../kotlin/net/liquidev/dawd3/block/Blocks.kt |  54 ++++++----
 .../net/liquidev/dawd3/block/SpeakerBlock.kt  |  46 --------
 .../dawd3/block/SpeakerBlockEntity.kt         |  20 ----
 .../dawd3/block/device/DeviceBlock.kt         |  27 +++++
 .../block/device/DeviceBlockDescriptor.kt     |  30 ++++++
 .../dawd3/block/device/DeviceBlockEntity.kt   |  40 +++++++
 .../dawd3/block/device/PhysicalPort.kt        |  31 ++++++
 .../block/devices/SpeakerBlockDescriptor.kt   |  49 +++++++++
 .../dawd3/block/entity/D3BlockEntity.kt       |  18 ++++
 .../dawd3/block/entity/blockEntityEvents.kt   |  17 +++
 .../net/liquidev/dawd3/common/Affine2x2.kt    |  23 ++++
 .../net/liquidev/dawd3/common/TaskQueue.kt    |  18 ++++
 .../kotlin/net/liquidev/dawd3/common/math.kt  |  14 +++
 .../net/liquidev/dawd3/datagen/Datagen.kt     |  14 +++
 .../liquidev/dawd3/datagen/ModelDatagen.kt    |  49 +++++++++
 .../dawd3/datagen/device/DeviceBlockModel.kt  |  99 ++++++++++++++++++
 .../net/liquidev/dawd3/datagen/json/json.kt   |  74 +++++++++++++
 .../net/liquidev/dawd3/datagen/json/model.kt  |  61 +++++++++++
 .../kotlin/net/liquidev/dawd3/item/Items.kt   |  14 ++-
 .../dawd3/mixin/SoundManagerAccessor.kt       |  12 ---
 .../dawd3/mixin/SoundSystemAccessor.kt        |  12 ---
 .../liquidev/dawd3/sound/AudioGenerator.kt    |  27 -----
 .../kotlin/net/liquidev/dawd3/sound/Sound.kt  |  32 ------
 .../assets/dawd3/blockstates/speaker.json     |   8 --
 .../resources/assets/dawd3/lang/en_us.json    |   4 +-
 .../assets/dawd3/models/block/speaker.json    |   6 --
 .../dawd3/textures/block/module_side.png      | Bin 125 -> 0 bytes
 .../dawd3/textures/block/speaker_front.png    | Bin 149 -> 297 bytes
 .../dawd3/textures/block/speaker_side.png     | Bin 0 -> 290 bytes
 .../assets/dawd3/textures/device/port.png     | Bin 0 -> 140 bytes
 src/main/resources/dawd3.mixins.json          |   2 -
 src/main/resources/fabric.mod.json            |   6 ++
 64 files changed, 1264 insertions(+), 207 deletions(-)
 delete mode 100644 proj/block/module_generic.ase
 create mode 100644 proj/block/speaker_side.ase
 create mode 100644 proj/device/port.ase
 create mode 100644 src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
 create mode 100644 src/main/generated/assets/dawd3/blockstates/speaker.json
 create mode 100644 src/main/generated/assets/dawd3/models/block/speaker.json
 rename src/main/{resources => generated}/assets/dawd3/models/item/speaker.json (100%)
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/AudioBuffer.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/Device.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/DeviceInstance.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/Devices.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/Sim.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/exceptions.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/ports.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/devices/ConstantDevice.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/devices/SineOscillatorDevice.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/devices/TerminalDevice.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/generator/AudioGenerator.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/generator/DeviceGraphGenerator.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/generator/MixGenerator.kt
 rename src/main/kotlin/net/liquidev/dawd3/{sound => audio/generator}/SineOscGenerator.kt (57%)
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/unit/volume.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlock.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlockEntity.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlock.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockDescriptor.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockEntity.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/PhysicalPort.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/devices/SpeakerBlockDescriptor.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/entity/D3BlockEntity.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/entity/blockEntityEvents.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/Affine2x2.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/TaskQueue.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/math.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/datagen/Datagen.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/datagen/ModelDatagen.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/datagen/device/DeviceBlockModel.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/datagen/json/json.kt
 create mode 100644 src/main/kotlin/net/liquidev/dawd3/datagen/json/model.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/mixin/SoundManagerAccessor.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/mixin/SoundSystemAccessor.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/sound/AudioGenerator.kt
 delete mode 100644 src/main/kotlin/net/liquidev/dawd3/sound/Sound.kt
 delete mode 100644 src/main/resources/assets/dawd3/blockstates/speaker.json
 delete mode 100644 src/main/resources/assets/dawd3/models/block/speaker.json
 delete mode 100644 src/main/resources/assets/dawd3/textures/block/module_side.png
 create mode 100644 src/main/resources/assets/dawd3/textures/block/speaker_side.png
 create mode 100644 src/main/resources/assets/dawd3/textures/device/port.png

diff --git a/build.gradle.kts b/build.gradle.kts
index 49717f2..570a3ef 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,11 @@ dependencies {
     minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String)
     mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2")
     modImplementation("net.fabricmc", "fabric-loader", project.extra["loader_version"] as String)
-    modImplementation("net.fabricmc.fabric-api", "fabric-api", project.extra["fabric_version"] as String)
+    modImplementation(
+        "net.fabricmc.fabric-api",
+        "fabric-api",
+        project.extra["fabric_version"] as String
+    )
     modImplementation(
         "net.fabricmc",
         "fabric-language-kotlin",
@@ -36,6 +40,27 @@ rustImport {
     layout.set("flat")
 }
 
+val mainSourceSet = sourceSets.main.get()
+
+val datagenDir = layout.projectDirectory.dir("src").dir(mainSourceSet.name).dir("generated")
+loom {
+    runs {
+        create("datagenClient") {
+            inherit(runConfigs["client"])
+            name("Data Generation")
+            vmArg("-Dfabric-api.datagen")
+            vmArg("-Dfabric-api.datagen.output-dir=$datagenDir")
+            vmArg("-Dfabric-api.datagen.modid=dawd3")
+            ideConfigGenerated(true)
+            runDir("build/datagen")
+        }
+    }
+}
+
+sourceSets.named(mainSourceSet.name) {
+    resources.srcDir(datagenDir)
+}
+
 tasks {
     val javaVersion = JavaVersion.toVersion((project.extra["java_version"] as String).toInt())
 
diff --git a/d3r/Cargo.lock b/d3r/Cargo.lock
index e3f902d..0b73e36 100644
--- a/d3r/Cargo.lock
+++ b/d3r/Cargo.lock
@@ -220,6 +220,7 @@ dependencies = [
  "bitvec",
  "cpal",
  "env_logger",
+ "hound",
  "jni 0.20.0",
  "log",
 ]
@@ -264,6 +265,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hound"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1"
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
diff --git a/d3r/Cargo.toml b/d3r/Cargo.toml
index f1efdf0..52ea656 100644
--- a/d3r/Cargo.toml
+++ b/d3r/Cargo.toml
@@ -12,5 +12,6 @@ crate-type = ["cdylib"]
 bitvec = "1.0.1"
 cpal = "0.14.1"
 env_logger = "0.9.3"
+hound = "3.5.0"
 jni = "0.20.0"
 log = "0.4.17"
diff --git a/d3r/src/lib.rs b/d3r/src/lib.rs
index 013f8c1..eccdce1 100644
--- a/d3r/src/lib.rs
+++ b/d3r/src/lib.rs
@@ -1,8 +1,10 @@
 use std::cell::RefCell;
 use std::fmt::Display;
+use std::fs::File;
 
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use cpal::{BufferSize, Device, Host, SampleRate, Stream, StreamConfig};
+use hound::{SampleFormat, WavSpec};
 use jni::objects::{JClass, JMethodID, JObject};
 use jni::signature::ReturnType;
 use jni::sys::jvalue;
@@ -157,6 +159,7 @@ pub extern "system" fn Java_net_liquidev_d3r_D3r_openOutputStream(
         let generator_ref = env.new_global_ref(generator).map_err(|e| e.to_string())?;
         let jvm = env.get_java_vm().map_err(|e| e.to_string())?;
         let mut initialized = false;
+
         let stream = device
             .build_output_stream(
                 &config.clone(),
diff --git a/proj/block/module_generic.ase b/proj/block/module_generic.ase
deleted file mode 100644
index 69f032a298db6c803827d300eaec16a4ebabdcea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmYdeVqkc%l#xMzL4ZMlfsuiMA%y`MC^ImE1Q|FOIFN;@#(u`g!0_uME7(?61_lN(
z1_lOp1+bM!cD!L=V31T$hKeXbX=LjE|NsBN{QnFLT<j_!wu&r>w9y2Sp=Kbm+wngG
z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{<ojse+Guz
z1_u8b80IiA{AXZT9i;T1fuUB5`#%Fifq=k&28Po<Ao2eVT>lvu{vVbHk)J^>`Tuy?
ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+
zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(C<EmSN~c2J}_7;%wWh}#gO}2*z32S-)#ef
zIbhe-YH=3`2!I^bzy)&7XO;htm%ZNEAt0inr0HU06YCLDI&Inh%XePNgRE3w28SPn
z0EGlQgHK{*YLSAW69WSSs{&Ml2|_b~Q%uF2-8Ijj{?9!9ZE~x=^H;6RT@zXppY^<w
VziPi~zRln1nrHSibOt`X0sy&>n-Ks2

diff --git a/proj/block/speaker_front.ase b/proj/block/speaker_front.ase
index a09f132bd4ad1dffa15ddfdc56cb988a7e908c4f..198b27d1ec313217afd7f14863274602080fd860 100644
GIT binary patch
literal 884
zcmXS6W?*=*l#xMzL4bjSfsuiMA%y`Mh%qpN1Q|FOIFN;@#{R;@!0_uMH`rEg1_lN(
z1_lOp1+bM!cFbd7V31S*$$<n#K?E8;G&ku#1H+Cf@&6eZ*7t}0XJDA$;`^V0VOojf
ze+GuSB=i3a4Cw(n{}~u$Wn}&{Fc|9V{%2tD_j3Kuz))3^`=5bf?%cWm85lG*6#m1E
zhOkZbwf{3PM45oZqii()GcZ&KSpH{Vm=X&zSwd9gzYhZg0}CkZKn^@KH)+R|`1Spv
z^ILqUl{nTVnWqQn$jZnV>g)P@xmK0r&Ye3~Q$v9PY?Z0Lc9e-il#OO}faR1}M+s38
zS&&%@OfV-fFff3e!^+^3SeaTRk5!T#BB@{mk!D8I3zIg+FKt-Kz`(!?au>)>xC21x
zqGC>}e>C3#1s<;c-}5UQe&0N@%urOL=|I<76Yot$!L#np)L@r(keBe7E7mGI`9$?A
z!MZ(Oa}s@iTrRfSlW=eQ#@9CgCRV0=zIMJbu5HQlplqjidl`Q%yctu$;M2u)SQBh9
zBLfKjhg;0bz`{^5M_7P?kxjutfPsAqLt_D0Aw&g2A;g8P{ft}(6nL291v-5H{tp*l
zy~$F7`^J|pFXjm!Ha=j>P;@<ctsx+7*IYNZQ{u;BPR*{~*m3f2_e%BS_VeFwlvH0|
z`{#f5{kiU;w>?fQJyp&4b%Wr&2(W$33``763<&#p7<d>e=7jco@-Y~2Fj+SJ`@jFF
zYA)CGg9!`_Q5h2#2B>SjoggzqnnRpz^|C!n|I59us>qNF;kWS2uYAFvY|i`_02D0E
A(*OVf

literal 627
zcmXSBVqkc%l#xMzL4ZMlfsuiMA%y`MC^ImE1Q|FOIFN;@#{SI6!0_uME7(?61_lN(
z1_lOp1+bM!cD!L=V31T$hKeXbX=LjE|NsBN{QnFLT<j_!wu&r>w9y2Sp=Kbm+wngG
z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{<ojse+Guz
z1_u8b80IiA{AXZT9i;T1fuUB5`#%Fifq=k&28Po<Ao2eVT>lvu{vVbHk)J^>`Tuy?
ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+
zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(C<EmSN~c2J}_7;%wWh}#gO}2*z32S-)#ef
zIbhe-YH=3`2!I^bzy)&7XO;htm%ZNEAt0inr0HU06YCLDI&Inh%XePNgRE3w28SPn
z0EGlQgHK{*YLSAWKLY~;s{&Ml2|_b~Q%uF2-8Ijj{?9!9ZE~x=^H;6RT@zXppDA>6
icB~L^O}^~kbuaL@`&;>*Z<A-$>jlrKXEb8FY5)M%0G{{&

diff --git a/proj/block/speaker_side.ase b/proj/block/speaker_side.ase
new file mode 100644
index 0000000000000000000000000000000000000000..c5b0faa40193e7343f67d30db644a2e7791684b6
GIT binary patch
literal 445
zcmdnX$iVPmDI<dbg8+j910w?iLka^j;9y_`2{Ldna3Bj)jcv=w!0_uME7(?61_lN(
z1_lOp1+bM!c6c!`Fi0xET)>Vb17jYVoAjT7VaJsC{|pT4`$PXTFwAf9{m;NKt;F#^
z14CVs`F{q6^Z=dzN(>APEFgb^3_CP8X~&fK_5GpqTYRULIMyYZrw8cBf>bCl!whC%
zVEE6#z`)AjlUSKr)CXcJK;-^2L1+eW;8o1Id?nz=dd?%ue%(q~(|OGOm_gwTDTzKK
z#w6*p|F1GmOW;XboXle>tnxSDr{=~!m&6&C2IY-63<{GBJam`-ax~G=VGFY7Q0|`i
v_<!Ry|8@TpUluO-qP%<loiE-R{}pa`Pg?FHV(>|En~k@|e<lW}mPgY7r-oex

literal 0
HcmV?d00001

diff --git a/proj/device/port.ase b/proj/device/port.ase
new file mode 100644
index 0000000000000000000000000000000000000000..a369e1b1d561b99413b0b74724c0805702b4f057
GIT binary patch
literal 324
zcmZ=^WMFu(l#xMzL4bjSfsuiMA%y`Mure@$1Q|FOIFN;@#y-Np!0_uME7(?61_lN(
z1_lOp1+bM!c33blFi0wZ<UxWgAOa2B+1dSPVBqED{m;OVn3(vVfnkRT&woh<1_l<8
zuRvPu?Cf}Xc@q;8cZl%FgCrD~kqr3{vY5dqu`;zt!BCHZfq_*4BKw~SLW4|VVW^ms
WoRXH7l9rUjmguG+&A{lypb7vA)f$%o

literal 0
HcmV?d00001

diff --git a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
new file mode 100644
index 0000000..23be6be
--- /dev/null
+++ b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3
@@ -0,0 +1,4 @@
+// 1.19.2	2022-11-20T23:04:16.520652716	Models
+e3c6aacd49a6395f37047d3df31f91a18a411267 assets/dawd3/models/item/speaker.json
+f7b47538f17992177e97e06842c0039ae5096b2b assets/dawd3/blockstates/speaker.json
+bd0adfc8b3dc271042dd4b19a8cace4e0fffedfe assets/dawd3/models/block/speaker.json
diff --git a/src/main/generated/assets/dawd3/blockstates/speaker.json b/src/main/generated/assets/dawd3/blockstates/speaker.json
new file mode 100644
index 0000000..c4792b6
--- /dev/null
+++ b/src/main/generated/assets/dawd3/blockstates/speaker.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "dawd3:block/speaker",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "dawd3:block/speaker"
+    },
+    "facing=south": {
+      "model": "dawd3:block/speaker",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "dawd3:block/speaker",
+      "y": 270
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/generated/assets/dawd3/models/block/speaker.json b/src/main/generated/assets/dawd3/models/block/speaker.json
new file mode 100644
index 0000000..a240d95
--- /dev/null
+++ b/src/main/generated/assets/dawd3/models/block/speaker.json
@@ -0,0 +1,73 @@
+{
+  "parent": "block/block",
+  "elements": [
+    {
+      "faces": {
+        "down": {
+          "cullface": "down",
+          "texture": "#side"
+        },
+        "east": {
+          "cullface": "east",
+          "texture": "#side"
+        },
+        "north": {
+          "cullface": "north",
+          "texture": "#front"
+        },
+        "south": {
+          "cullface": "south",
+          "texture": "#side"
+        },
+        "up": {
+          "cullface": "up",
+          "texture": "#side"
+        },
+        "west": {
+          "cullface": "west",
+          "texture": "#side"
+        }
+      },
+      "from": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "to": [
+        16.0,
+        16.0,
+        16.0
+      ]
+    },
+    {
+      "faces": {
+        "south": {
+          "cullface": "south",
+          "texture": "#port",
+          "uv": [
+            0.0,
+            0.0,
+            4.0,
+            4.0
+          ]
+        }
+      },
+      "from": [
+        6.5,
+        6.5,
+        15.99
+      ],
+      "to": [
+        9.5,
+        9.5,
+        16.01
+      ]
+    }
+  ],
+  "textures": {
+    "front": "dawd3:block/speaker_front",
+    "particle": "#side",
+    "port": "dawd3:device/port",
+    "side": "dawd3:block/speaker_side"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/dawd3/models/item/speaker.json b/src/main/generated/assets/dawd3/models/item/speaker.json
similarity index 100%
rename from src/main/resources/assets/dawd3/models/item/speaker.json
rename to src/main/generated/assets/dawd3/models/item/speaker.json
diff --git a/src/main/java/net/liquidev/d3r/AudioOutputStream.java b/src/main/java/net/liquidev/d3r/AudioOutputStream.java
index 2dfe1ee..7daa098 100644
--- a/src/main/java/net/liquidev/d3r/AudioOutputStream.java
+++ b/src/main/java/net/liquidev/d3r/AudioOutputStream.java
@@ -1,7 +1,7 @@
 package net.liquidev.d3r;
 
 public interface AudioOutputStream {
-    float[] getOutputBuffer(int sampleCount, int channels);
+    float[] getOutputBuffer(int sampleCount, int channelCount);
 
     void error(String message);
 }
diff --git a/src/main/java/net/liquidev/d3r/D3r.java b/src/main/java/net/liquidev/d3r/D3r.java
index 050fb87..38a6dff 100644
--- a/src/main/java/net/liquidev/d3r/D3r.java
+++ b/src/main/java/net/liquidev/d3r/D3r.java
@@ -9,7 +9,7 @@ import java.nio.file.Path;
 import java.util.Comparator;
 
 public class D3r {
-    private static final Logger LOGGER = LoggerFactory.getLogger("dawd³/d3r");
+    private static final Logger LOGGER = LoggerFactory.getLogger("dawd3/d3r");
     private static Path tempDir = null;
 
     public static void load() throws D3rException, IOException {
diff --git a/src/main/kotlin/net/liquidev/dawd3/D3Registry.kt b/src/main/kotlin/net/liquidev/dawd3/D3Registry.kt
index 7f568c7..d1f4c68 100644
--- a/src/main/kotlin/net/liquidev/dawd3/D3Registry.kt
+++ b/src/main/kotlin/net/liquidev/dawd3/D3Registry.kt
@@ -7,8 +7,8 @@ abstract class D3Registry<T> {
 
     var registered = arrayListOf<Registered<T>>()
 
-    fun add(id: String, item: T): Registered<T> {
-        val entry = Registered(Identifier(Mod.id, id), item)
+    fun add(id: Identifier, item: T): Registered<T> {
+        val entry = Registered(id, item)
         registered.add(entry)
         return entry
     }
diff --git a/src/main/kotlin/net/liquidev/dawd3/Mod.kt b/src/main/kotlin/net/liquidev/dawd3/Mod.kt
index ed95be5..f8763e2 100644
--- a/src/main/kotlin/net/liquidev/dawd3/Mod.kt
+++ b/src/main/kotlin/net/liquidev/dawd3/Mod.kt
@@ -4,33 +4,45 @@ import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.api.ModInitializer
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
 import net.liquidev.d3r.D3r
+import net.liquidev.dawd3.audio.Audio
 import net.liquidev.dawd3.block.Blocks
+import net.liquidev.dawd3.block.entity.registerBlockEntityEvents
 import net.liquidev.dawd3.item.Items
-import net.liquidev.dawd3.sound.Sound
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 @Suppress("UNUSED")
 object Mod : ModInitializer, ClientModInitializer {
     const val id = "dawd3"
 
-    private val logger = LoggerFactory.getLogger("dawd³")
+    val logger = logger(null)
 
     override fun onInitialize() {
         logger.info("hello, sound traveler! welcome to the dawd³ experience")
-
-        Blocks.blockRegistry.registerAll()
+        Blocks.initialize()
         Items.registry.registerAll()
     }
 
     override fun onInitializeClient() {
         logger.info("booting up sound engine")
         D3r.load()
-        Sound.forceInitializationNow()
+        Audio.forceInitializationNow()
 
         ClientLifecycleEvents.CLIENT_STOPPING.register {
             logger.info("shutting down sound engine")
-            Sound.deinitialize()
+            Audio.deinitialize()
             D3r.unload()
         }
+
+        registerBlockEntityEvents()
     }
+
+    private fun loggerName(name: String?): String =
+        if (name != null) "$id/$name" else id
+
+    fun logger(name: String?): Logger =
+        LoggerFactory.getLogger(loggerName(name))
+
+    inline fun <reified T> logger(): Logger =
+        logger(T::class.simpleName)
 }
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt b/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt
new file mode 100644
index 0000000..89d52ab
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt
@@ -0,0 +1,37 @@
+package net.liquidev.dawd3.audio
+
+import net.liquidev.d3r.D3r
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.audio.generator.MixGenerator
+import net.liquidev.dawd3.audio.unit.Decibels
+
+/** Audio system and common settings. */
+object Audio {
+    val logger = Mod.logger<Audio>()
+
+    const val sampleRate = 48000
+    const val sampleRateF = sampleRate.toFloat()
+    const val sampleRateFInv = 1.0f / sampleRateF
+    private const val bufferSize = 256
+
+    private val outputDeviceId: Int
+    private val outputStreamId: Int
+
+    val mixer = MixGenerator()
+
+    init {
+        logger.info("initializing")
+        logger.info("${Decibels(-3.0f).toAmplitude()}")
+        D3r.openDefaultHost()
+        outputDeviceId = D3r.openDefaultOutputDevice()
+        outputStreamId = D3r.openOutputStream(outputDeviceId, sampleRate, 1, bufferSize, mixer)
+        D3r.startPlayback(outputStreamId)
+    }
+
+    fun forceInitializationNow() {}
+
+    fun deinitialize() {
+        D3r.closeOutputStream(outputStreamId)
+        D3r.closeOutputDevice(outputDeviceId)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/AudioBuffer.kt b/src/main/kotlin/net/liquidev/dawd3/audio/AudioBuffer.kt
new file mode 100644
index 0000000..4c6cf74
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/AudioBuffer.kt
@@ -0,0 +1,23 @@
+package net.liquidev.dawd3.audio
+
+import net.liquidev.dawd3.Mod
+
+/** Audio buffer that reallocates itself when needed. */
+class AudioBuffer {
+    private companion object {
+        val logger = Mod.logger<AudioBuffer>()
+    }
+
+    var array: FloatArray? = null
+        private set
+
+    fun getOrReallocate(minSampleCount: Int): FloatArray {
+        val inArray = array
+        if (inArray == null || inArray.size < minSampleCount) {
+            logger.info("reallocating output buffer for $this; this might cause stuttering")
+            // Allocate a little more so that reallocations don't trigger too often.
+            array = FloatArray(minSampleCount)
+        }
+        return array!!
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/Device.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/Device.kt
new file mode 100644
index 0000000..0f829ea
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/Device.kt
@@ -0,0 +1,9 @@
+package net.liquidev.dawd3.audio.device
+
+/** Device that can process audio. */
+interface Device {
+    fun process(sampleCount: Int, channels: Int)
+
+    fun visitInputPorts(visit: (PortName, InputPort) -> Unit) {}
+    fun visitOutputPorts(visit: (PortName, OutputPort) -> Unit) {}
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/DeviceInstance.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/DeviceInstance.kt
new file mode 100644
index 0000000..6ad8cb1
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/DeviceInstance.kt
@@ -0,0 +1,33 @@
+package net.liquidev.dawd3.audio.device
+
+class DeviceInstance(val state: Device) {
+    val inputPortsByName = hashMapOf<PortName, InputPort>()
+    val outputPortsByName = hashMapOf<PortName, OutputPort>()
+
+    init {
+        state.visitInputPorts { portName, inputPort ->
+            ensureUniquePort(portName)
+            inputPortsByName[portName] = inputPort
+            inputPort.owningDevice = this
+        }
+        state.visitOutputPorts { portName, outputPort ->
+            ensureUniquePort(portName)
+            outputPortsByName[portName] = outputPort
+            outputPort.owningDevice = this
+        }
+    }
+
+    private fun ensureUniquePort(name: PortName) {
+        if (name in inputPortsByName || name in outputPortsByName) {
+            throw PortAlreadyExistsException("port $name is already registered in device $this")
+        }
+    }
+
+    fun process(sampleCount: Int, channels: Int) {
+        state.process(sampleCount, channels)
+    }
+
+    override fun toString(): String {
+        return "DeviceInstance($state)"
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/Devices.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/Devices.kt
new file mode 100644
index 0000000..68d20d7
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/Devices.kt
@@ -0,0 +1,53 @@
+package net.liquidev.dawd3.audio.device
+
+/** Device utility functions. */
+object Devices {
+    fun makeConnection(
+        from: DeviceInstance,
+        outputPortName: PortName,
+        to: DeviceInstance,
+        inputPortName: PortName
+    ) {
+        val outputPort = from.outputPortsByName[outputPortName]
+        val inputPort = to.inputPortsByName[inputPortName]
+
+        if (outputPort == null) {
+            throw noSuchPort(from, outputPortName)
+        }
+        if (inputPort == null) {
+            throw noSuchPort(to, inputPortName)
+        }
+
+        inputPort.connectedOutput = outputPort
+        outputPort.connectedInputs.add(inputPort)
+    }
+
+    /** Disconnects everything from the given port. Returns the number of ports disconnected. */
+    fun severAllConnections(device: DeviceInstance, portName: PortName): Int {
+        var total = 0
+
+        val inputPort = device.inputPortsByName[portName]
+        if (inputPort != null) {
+            val connectedOutput = inputPort.connectedOutput
+            if (connectedOutput != null) {
+                connectedOutput.connectedInputs.remove(inputPort)
+                inputPort.connectedOutput = null
+                total += 1
+            }
+        }
+
+        val outputPort = device.outputPortsByName[portName]
+        if (outputPort != null) {
+            for (port in outputPort.connectedInputs) {
+                port.connectedOutput = null
+            }
+            total += outputPort.connectedInputs.size
+            outputPort.connectedInputs.clear()
+        }
+
+        return total
+    }
+
+    private fun noSuchPort(device: DeviceInstance, name: PortName): NoSuchPortException =
+        NoSuchPortException("device $device does not have port with name $name")
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/Sim.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/Sim.kt
new file mode 100644
index 0000000..80b873c
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/Sim.kt
@@ -0,0 +1,45 @@
+package net.liquidev.dawd3.audio.device
+
+import net.liquidev.dawd3.Mod
+
+/**
+ * Sim is the simulator for device graphs.
+ */
+class Sim {
+    private companion object {
+        val logger = Mod.logger<Sim>()
+    }
+
+    private val stack = arrayListOf<DeviceInstance>()
+    private val evalList = arrayListOf<DeviceInstance>()
+    private val visited = arrayListOf<DeviceInstance>()
+
+    /**
+     * Builds a simulation sequence: establishes the order in which devices in a graph have to be
+     * processed so that we arrive at the input signals fed into the terminal.
+     */
+    fun rebuild(terminal: DeviceInstance) {
+        stack.add(terminal)
+
+        evalList.clear()
+        while (stack.isNotEmpty()) {
+            val device = stack.removeAt(stack.size - 1)
+            evalList.add(device)
+            for ((_, inputPort) in device.inputPortsByName) {
+                val connectedOutputPort = inputPort.connectedOutput
+                if (connectedOutputPort != null) {
+                    stack.add(connectedOutputPort.owningDevice)
+                }
+            }
+        }
+
+        logger.info("rebuilt device graph; new evaluation order (reversed): $evalList")
+    }
+
+    /** Process all devices in the built sequence. */
+    fun simulate(sampleCount: Int, channels: Int) {
+        for (device in evalList.asReversed()) {
+            device.process(sampleCount, channels)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/exceptions.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/exceptions.kt
new file mode 100644
index 0000000..ab39fe9
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/exceptions.kt
@@ -0,0 +1,5 @@
+package net.liquidev.dawd3.audio.device
+
+class NoSuchPortException(what: String) : Exception(what)
+
+class PortAlreadyExistsException(what: String) : Exception(what)
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/device/ports.kt b/src/main/kotlin/net/liquidev/dawd3/audio/device/ports.kt
new file mode 100644
index 0000000..ed37895
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/device/ports.kt
@@ -0,0 +1,38 @@
+package net.liquidev.dawd3.audio.device
+
+import net.liquidev.dawd3.audio.AudioBuffer
+
+class InputPort {
+    private companion object {
+        val emptyBuffer = AudioBuffer()
+    }
+
+    var connectedOutput: OutputPort? = null
+    lateinit var owningDevice: DeviceInstance
+
+    /**
+     * Convenience function that returns an empty buffer if there is no connected port, or the
+     * connected port doesn't have a buffer with the given index.
+     */
+    fun getConnectedOutputBuffer(index: Int, sampleCount: Int): FloatArray {
+        val connectedOutput = connectedOutput
+        return if (connectedOutput != null && index < connectedOutput.buffers.size) {
+            connectedOutput.buffers[index].array ?: emptyBuffer.getOrReallocate(sampleCount)
+        } else {
+            emptyBuffer.getOrReallocate(sampleCount)
+        }
+    }
+}
+
+class OutputPort(bufferCount: Int) {
+    init {
+        require(bufferCount >= 1) { "output port must have at least one buffer" }
+    }
+
+    val buffers = Array(bufferCount) { AudioBuffer() }
+    val connectedInputs = hashSetOf<InputPort>()
+    lateinit var owningDevice: DeviceInstance
+}
+
+/** Marker class that port name markers should inherit from. */
+abstract class PortName
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/devices/ConstantDevice.kt b/src/main/kotlin/net/liquidev/dawd3/audio/devices/ConstantDevice.kt
new file mode 100644
index 0000000..b6ef896
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/devices/ConstantDevice.kt
@@ -0,0 +1,22 @@
+package net.liquidev.dawd3.audio.devices
+
+import net.liquidev.dawd3.audio.device.Device
+import net.liquidev.dawd3.audio.device.OutputPort
+import net.liquidev.dawd3.audio.device.PortName
+
+class ConstantDevice(var value: Float) : Device {
+    object Output : PortName()
+
+    val output = OutputPort(bufferCount = 1)
+
+    override fun process(sampleCount: Int, channels: Int) {
+        val outputBuffer = output.buffers[0].getOrReallocate(sampleCount)
+        for (i in 0 until sampleCount) {
+            outputBuffer[i] = value
+        }
+    }
+
+    override fun visitOutputPorts(visit: (PortName, OutputPort) -> Unit) {
+        visit(Output, output)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/devices/SineOscillatorDevice.kt b/src/main/kotlin/net/liquidev/dawd3/audio/devices/SineOscillatorDevice.kt
new file mode 100644
index 0000000..457b4b8
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/devices/SineOscillatorDevice.kt
@@ -0,0 +1,39 @@
+package net.liquidev.dawd3.audio.devices
+
+import net.liquidev.dawd3.audio.Audio
+import net.liquidev.dawd3.audio.device.Device
+import net.liquidev.dawd3.audio.device.InputPort
+import net.liquidev.dawd3.audio.device.OutputPort
+import net.liquidev.dawd3.audio.device.PortName
+import kotlin.math.sin
+
+private const val twoPi = 2.0f * kotlin.math.PI.toFloat()
+
+class SineOscillatorDevice : Device {
+    object FrequencyCV : PortName()
+    object Output : PortName()
+
+    val frequencyCV = InputPort()
+    val output = OutputPort(bufferCount = 1)
+
+    private var phase = 0.0f
+
+    override fun process(sampleCount: Int, channels: Int) {
+        val frequencyBuffer = frequencyCV.getConnectedOutputBuffer(0, sampleCount)
+        val outputBuffer = output.buffers[0].getOrReallocate(sampleCount)
+        for (i in 0 until sampleCount) {
+            val phaseStep = Audio.sampleRateFInv * frequencyBuffer[i]
+            phase += phaseStep
+            phase %= 1.0f
+            outputBuffer[i] = sin(phase * twoPi)
+        }
+    }
+
+    override fun visitInputPorts(visit: (PortName, InputPort) -> Unit) {
+        visit(FrequencyCV, frequencyCV)
+    }
+
+    override fun visitOutputPorts(visit: (PortName, OutputPort) -> Unit) {
+        visit(Output, output)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/devices/TerminalDevice.kt b/src/main/kotlin/net/liquidev/dawd3/audio/devices/TerminalDevice.kt
new file mode 100644
index 0000000..588482e
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/devices/TerminalDevice.kt
@@ -0,0 +1,21 @@
+package net.liquidev.dawd3.audio.devices
+
+import net.liquidev.dawd3.audio.device.Device
+import net.liquidev.dawd3.audio.device.InputPort
+import net.liquidev.dawd3.audio.device.PortName
+
+class TerminalDevice : Device {
+    object Input : PortName()
+
+    val input = InputPort()
+
+    override fun process(sampleCount: Int, channels: Int) {
+        // Terminals don't do any audio processing.
+        // The output port connected to `input` is instead used by terminal block entities like
+        // speakers.
+    }
+
+    override fun visitInputPorts(visit: (PortName, InputPort) -> Unit) {
+        visit(Input, input)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/generator/AudioGenerator.kt b/src/main/kotlin/net/liquidev/dawd3/audio/generator/AudioGenerator.kt
new file mode 100644
index 0000000..f670de5
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/generator/AudioGenerator.kt
@@ -0,0 +1,30 @@
+package net.liquidev.dawd3.audio.generator
+
+import net.liquidev.d3r.AudioOutputStream
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.audio.AudioBuffer
+
+abstract class AudioGenerator : AudioOutputStream {
+    private companion object {
+        val logger = Mod.logger<AudioGenerator>()
+    }
+
+    private var outputBuffer = AudioBuffer()
+
+    abstract fun generate(output: FloatArray, sampleCount: Int, channelCount: Int)
+
+    override fun getOutputBuffer(sampleCount: Int, channelCount: Int): FloatArray {
+        val outputArray = outputBuffer.getOrReallocate(sampleCount)
+        try {
+            generate(outputArray, sampleCount, channelCount)
+        } catch (e: Exception) {
+            logger.error("exception occured in audio generator")
+            e.printStackTrace()
+        }
+        return outputArray
+    }
+
+    override fun error(message: String) {
+        println("Error reported by audio stream: $message")
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/generator/DeviceGraphGenerator.kt b/src/main/kotlin/net/liquidev/dawd3/audio/generator/DeviceGraphGenerator.kt
new file mode 100644
index 0000000..2b644af
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/generator/DeviceGraphGenerator.kt
@@ -0,0 +1,28 @@
+package net.liquidev.dawd3.audio.generator
+
+import net.liquidev.dawd3.audio.device.DeviceInstance
+import net.liquidev.dawd3.audio.device.Sim
+import net.liquidev.dawd3.audio.devices.TerminalDevice
+
+/** Audio generator that evaluates a device graph. */
+class DeviceGraphGenerator : AudioGenerator() {
+    private val sim = Sim()
+    private val terminalDeviceState = TerminalDevice()
+    val terminalDevice = DeviceInstance(terminalDeviceState)
+
+    /**
+     * This should be called whenever the device graph changes to reestablish what order devices
+     * should be processed in.
+     */
+    fun rebuildSim() {
+        sim.rebuild(terminalDevice)
+    }
+
+    override fun generate(output: FloatArray, sampleCount: Int, channelCount: Int) {
+        sim.simulate(sampleCount, channelCount)
+        val buffer = terminalDeviceState.input.getConnectedOutputBuffer(0, sampleCount)
+        for (i in 0 until sampleCount) {
+            output[i] = buffer[i]
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/generator/MixGenerator.kt b/src/main/kotlin/net/liquidev/dawd3/audio/generator/MixGenerator.kt
new file mode 100644
index 0000000..d6dbb20
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/generator/MixGenerator.kt
@@ -0,0 +1,89 @@
+package net.liquidev.dawd3.audio.generator
+
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.audio.unit.Decibels
+import net.liquidev.dawd3.common.TaskQueue
+import java.lang.ref.WeakReference
+
+/** Audio mixer. Mixes multiple channels into a single output stream. */
+class MixGenerator : AudioGenerator() {
+    private companion object {
+        val logger = Mod.logger<MixGenerator>()
+    }
+
+    private val taskQueue = TaskQueue()
+    private val channels = arrayListOf<WeakReference<Channel<AudioGenerator>>>()
+
+    fun <T : AudioGenerator> createChannel(generator: T): Channel<T> {
+        val channel = Channel(taskQueue, generator)
+        val weak = WeakReference(channel as Channel<AudioGenerator>)
+        taskQueue.execute { channels.add(weak) }
+        return channel
+    }
+
+    override fun generate(output: FloatArray, sampleCount: Int, channelCount: Int) {
+        // Flush task queue as soon as possible to reduce latency.
+        taskQueue.flush()
+        reapStoppedChannels()
+
+        for (i in 0 until sampleCount) {
+            output[i] = 0.0f
+        }
+
+        // NOTE: These loops are separated for better efficiency.
+        // The processor is better at performing the same task many times, and interleaving types of tasks
+        // is slower than doing them in batches.
+        for (weak in channels) {
+            val channel = weak.get()!!
+            channel.audioBuffer = channel.generator.getOutputBuffer(sampleCount, channelCount)
+        }
+        for (weak in channels) {
+            val channel = weak.get()!!
+            for (i in 0 until sampleCount) {
+                output[i] += channel.audioBuffer[i] * channel.volume.value
+            }
+        }
+    }
+
+    private fun reapStoppedChannels() {
+        var i = 0
+        while (i < channels.size) {
+            val channel = channels[i].get()
+            val reap = channel == null || !channel.playing
+            if (reap) {
+                logger.info("reaping channel at index $i in queue $channels")
+                channels[i] = channels[channels.size - 1]
+                channels.removeAt(channels.size - 1)
+            } else {
+                ++i
+            }
+        }
+    }
+
+    class Channel<out T : AudioGenerator>(
+        private val taskQueue: TaskQueue,
+        val generator: T,
+    ) {
+        private companion object {
+            val logger = Mod.logger<Channel<AudioGenerator>>()
+        }
+
+        var volume = Decibels(-12.0f).toAmplitude()
+        var playing = true
+            private set
+        lateinit var audioBuffer: FloatArray
+
+        /** Shuts down the channel on the next audio generation request. */
+        fun stop() {
+            taskQueue.execute { playing = false }
+        }
+
+        fun finalize() {
+            if (playing) {
+                logger.warn("mixer channel stopped in finalizer; this might cause a ConcurrentModificationException")
+            }
+            stop()
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/sound/SineOscGenerator.kt b/src/main/kotlin/net/liquidev/dawd3/audio/generator/SineOscGenerator.kt
similarity index 57%
rename from src/main/kotlin/net/liquidev/dawd3/sound/SineOscGenerator.kt
rename to src/main/kotlin/net/liquidev/dawd3/audio/generator/SineOscGenerator.kt
index f6d5240..30ebf7c 100644
--- a/src/main/kotlin/net/liquidev/dawd3/sound/SineOscGenerator.kt
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/generator/SineOscGenerator.kt
@@ -1,18 +1,20 @@
-package net.liquidev.dawd3.sound
+package net.liquidev.dawd3.audio.generator
 
+import net.liquidev.dawd3.audio.Audio
+import net.liquidev.dawd3.audio.unit.Amplitude
 import kotlin.math.sin
 
-class SineOscGenerator(frequency: Float, private val amplitude: Float) : AudioGenerator() {
-    private val phaseStep = (1.0f / Sound.sampleRate.toFloat()) * frequency
+class SineOscGenerator(frequency: Float, private val amplitude: Amplitude) : AudioGenerator() {
+    private val phaseStep = (1.0f / Audio.sampleRate.toFloat()) * frequency
     private var phase = 0.0f
 
     private fun synthesize(): Float {
         phase += phaseStep
         phase %= 1.0f
-        return sin(phase * 2.0f * kotlin.math.PI.toFloat()) * amplitude
+        return sin(phase * 2.0f * kotlin.math.PI.toFloat())
     }
 
-    override fun generate(output: FloatArray, sampleCount: Int, channels: Int) {
+    override fun generate(output: FloatArray, sampleCount: Int, channelCount: Int) {
         for (i in 0 until sampleCount) {
             val sample = synthesize()
             output[i] = sample
diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/unit/volume.kt b/src/main/kotlin/net/liquidev/dawd3/audio/unit/volume.kt
new file mode 100644
index 0000000..a7d82b0
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/audio/unit/volume.kt
@@ -0,0 +1,14 @@
+package net.liquidev.dawd3.audio.unit
+
+import kotlin.math.log10
+import kotlin.math.pow
+
+@JvmInline
+value class Amplitude(val value: Float) {
+    fun toDecibels(): Decibels = Decibels(20.0f * log10(value))
+}
+
+@JvmInline
+value class Decibels(val value: Float) {
+    fun toAmplitude(): Amplitude = Amplitude(10.0f.pow(value / 20.0f))
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/Blocks.kt b/src/main/kotlin/net/liquidev/dawd3/block/Blocks.kt
index 73bd3e5..5f44862 100644
--- a/src/main/kotlin/net/liquidev/dawd3/block/Blocks.kt
+++ b/src/main/kotlin/net/liquidev/dawd3/block/Blocks.kt
@@ -1,38 +1,50 @@
 package net.liquidev.dawd3.block
 
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings
-import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
 import net.fabricmc.fabric.api.`object`.builder.v1.block.entity.FabricBlockEntityTypeBuilder
 import net.liquidev.dawd3.D3Registry
-import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.block.device.AnyDeviceBlockDescriptor
+import net.liquidev.dawd3.block.device.DeviceBlock
+import net.liquidev.dawd3.block.device.DeviceBlockEntity
+import net.liquidev.dawd3.block.devices.SpeakerBlockDescriptor
 import net.liquidev.dawd3.item.Items
 import net.minecraft.block.Block
-import net.minecraft.block.Material
+import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.item.BlockItem
 import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
 
 object Blocks {
-    var blockRegistry = object : D3Registry<Block>() {
-        override fun doRegister(identifier: Identifier, item: Block) {
-            Registry.register(Registry.BLOCK, identifier, item)
-        }
-    }
-
-    val speaker = add("speaker", SpeakerBlock(moduleBlockSettings()))
-    val speakerEntity = Registry.register(
-        Registry.BLOCK_ENTITY_TYPE,
-        Identifier(Mod.id, "speaker"),
-        FabricBlockEntityTypeBuilder.create(::SpeakerBlockEntity, speaker.item).build(),
+    data class RegisteredDeviceBlock(
+        val block: Block,
+        val item: D3Registry.Registered<Items.RegisteredItem>,
+        val blockEntity: BlockEntityType<DeviceBlockEntity>,
+        val descriptor: AnyDeviceBlockDescriptor,
     )
 
-    private fun moduleBlockSettings() = FabricBlockSettings
-        .of(Material.METAL)
-        .hardness(5.0f)
-        .resistance(6.0f)
+    val deviceBlocks = hashMapOf<Identifier, RegisteredDeviceBlock>()
 
-    private fun add(name: String, block: Block): D3Registry.Registered<Block> {
-        Items.addItem(name, BlockItem(block, FabricItemSettings().group(Items.creativeTab)))
-        return blockRegistry.add(name, block)
+    fun registerDeviceBlock(descriptor: AnyDeviceBlockDescriptor): RegisteredDeviceBlock {
+        val block =
+            Registry.register(Registry.BLOCK, descriptor.id, DeviceBlock(descriptor))
+        val item = Items.addItem(
+            descriptor.id,
+            BlockItem(block, FabricItemSettings().group(Items.creativeTab))
+        )
+        val blockEntity = Registry.register(
+            Registry.BLOCK_ENTITY_TYPE,
+            descriptor.id,
+            FabricBlockEntityTypeBuilder.create(
+                DeviceBlockEntity.factory(descriptor), block
+            ).build(),
+        )
+        val registeredDeviceBlock = RegisteredDeviceBlock(block, item, blockEntity, descriptor)
+        deviceBlocks[descriptor.id] = registeredDeviceBlock
+        return registeredDeviceBlock
     }
+
+    // Device blocks
+    val speaker = registerDeviceBlock(SpeakerBlockDescriptor)
+
+    fun initialize() {}
 }
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlock.kt b/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlock.kt
deleted file mode 100644
index 7a02619..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlock.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.liquidev.dawd3.block
-
-import net.minecraft.block.*
-import net.minecraft.block.entity.BlockEntity
-import net.minecraft.entity.LivingEntity
-import net.minecraft.entity.player.PlayerEntity
-import net.minecraft.item.ItemPlacementContext
-import net.minecraft.item.ItemStack
-import net.minecraft.state.StateManager
-import net.minecraft.state.property.Properties
-import net.minecraft.util.math.BlockPos
-import net.minecraft.world.World
-
-class SpeakerBlock(settings: Settings) : BlockWithEntity(settings), BlockEntityProvider {
-    override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
-        builder.add(Properties.HORIZONTAL_FACING)
-    }
-
-    override fun getPlacementState(ctx: ItemPlacementContext): BlockState {
-        return defaultState.with(Properties.HORIZONTAL_FACING, ctx.playerFacing.opposite)
-    }
-
-    override fun createBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
-        return SpeakerBlockEntity(pos, state)
-    }
-
-    override fun getRenderType(state: BlockState): BlockRenderType {
-        return BlockRenderType.MODEL
-    }
-
-    override fun onPlaced(
-        world: World,
-        pos: BlockPos,
-        state: BlockState,
-        placer: LivingEntity?,
-        itemStack: ItemStack,
-    ) {
-        println("Speaker placed")
-    }
-
-    override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity) {
-        println("Speaker broken, deinitializing block entity")
-        val blockEntity = world.getBlockEntity(pos) as SpeakerBlockEntity
-        blockEntity.deinit()
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlockEntity.kt b/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlockEntity.kt
deleted file mode 100644
index 19e1d7c..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/block/SpeakerBlockEntity.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.liquidev.dawd3.block
-
-import net.minecraft.block.BlockState
-import net.minecraft.block.entity.BlockEntity
-import net.minecraft.util.math.BlockPos
-
-class SpeakerBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Blocks.speakerEntity, pos, state) {
-    init {
-        println("Speaker block entity created")
-
-    }
-
-    fun deinit() {
-        println("Speaker block entity deinitialized")
-    }
-
-    private fun finalize() {
-        deinit()
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlock.kt b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlock.kt
new file mode 100644
index 0000000..a516042
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlock.kt
@@ -0,0 +1,27 @@
+package net.liquidev.dawd3.block.device
+
+import net.minecraft.block.*
+import net.minecraft.block.entity.BlockEntity
+import net.minecraft.item.ItemPlacementContext
+import net.minecraft.state.StateManager
+import net.minecraft.state.property.Properties
+import net.minecraft.util.math.BlockPos
+
+class DeviceBlock(private val descriptor: AnyDeviceBlockDescriptor) :
+    BlockWithEntity(descriptor.blockSettings),
+    BlockEntityProvider {
+
+    override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
+        builder.add(Properties.HORIZONTAL_FACING)
+    }
+
+    override fun getPlacementState(context: ItemPlacementContext): BlockState =
+        defaultState.with(Properties.HORIZONTAL_FACING, context.playerFacing.opposite)
+
+    @Deprecated("do not call directly")
+    override fun getRenderType(state: BlockState): BlockRenderType =
+        BlockRenderType.MODEL
+
+    override fun createBlockEntity(pos: BlockPos, state: BlockState): BlockEntity =
+        DeviceBlockEntity.factory(descriptor).create(pos, state)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockDescriptor.kt b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockDescriptor.kt
new file mode 100644
index 0000000..505cc3d
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockDescriptor.kt
@@ -0,0 +1,30 @@
+package net.liquidev.dawd3.block.device
+
+import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
+import net.liquidev.dawd3.audio.device.DeviceInstance
+import net.minecraft.block.AbstractBlock
+import net.minecraft.block.Material
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.Identifier
+
+typealias AnyDeviceBlockDescriptor = DeviceBlockDescriptor<DeviceBlockDescriptor.ClientState, Any>
+
+interface DeviceBlockDescriptor<out CS : DeviceBlockDescriptor.ClientState, out ServerState> {
+    val id: Identifier
+    val blockSettings: AbstractBlock.Settings
+        // The default block settings are used for metal-enclosed modules.
+        get() = FabricBlockSettings
+            .of(Material.METAL)
+            .hardness(5.0f)
+            .resistance(6.0f)
+
+    val portLayout: Array<PhysicalPort>
+
+    fun onClientLoad(world: ClientWorld): CS
+    fun onClientUnload(state: @UnsafeVariance CS, world: ClientWorld) {}
+
+    interface ClientState {
+        val logicalDevice: DeviceInstance
+    }
+}
+
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockEntity.kt b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockEntity.kt
new file mode 100644
index 0000000..59e45b7
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockEntity.kt
@@ -0,0 +1,40 @@
+package net.liquidev.dawd3.block.device
+
+import net.fabricmc.fabric.api.`object`.builder.v1.block.entity.FabricBlockEntityTypeBuilder
+import net.liquidev.dawd3.block.Blocks
+import net.liquidev.dawd3.block.entity.D3BlockEntity
+import net.minecraft.block.BlockState
+import net.minecraft.block.entity.BlockEntityType
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+
+private typealias DeviceBlockFactory = FabricBlockEntityTypeBuilder.Factory<DeviceBlockEntity>
+
+class DeviceBlockEntity(
+    type: BlockEntityType<DeviceBlockEntity>,
+    blockPos: BlockPos,
+    blockState: BlockState,
+    private val descriptor: AnyDeviceBlockDescriptor,
+) : D3BlockEntity(type, blockPos, blockState) {
+    companion object {
+        fun factory(descriptor: AnyDeviceBlockDescriptor): DeviceBlockFactory =
+            DeviceBlockFactory { blockPos, blockState ->
+                val type by lazy { Blocks.deviceBlocks[descriptor.id]!!.blockEntity }
+                DeviceBlockEntity(type, blockPos, blockState, descriptor)
+            }
+    }
+
+    private var clientState: DeviceBlockDescriptor.ClientState? = null
+    private var serverState: Any? = null
+
+    override fun onClientLoad(world: ClientWorld) {
+        clientState = descriptor.onClientLoad(world)
+    }
+
+    override fun onClientUnload(world: ClientWorld) {
+        val clientState = clientState
+        if (clientState != null) {
+            descriptor.onClientUnload(clientState, world)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/device/PhysicalPort.kt b/src/main/kotlin/net/liquidev/dawd3/block/device/PhysicalPort.kt
new file mode 100644
index 0000000..3669446
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/device/PhysicalPort.kt
@@ -0,0 +1,31 @@
+package net.liquidev.dawd3.block.device
+
+import net.liquidev.dawd3.audio.device.PortName
+import net.liquidev.dawd3.common.Affine2x2
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Vec2f
+
+/** The physical appearance of a port. */
+data class PhysicalPort(
+    val port: PortName,
+    /** The coordinates are relative, in range [0.0, 1.0] where 0 is top-left and 1 is bottom-right. */
+    val position: Vec2f,
+    val side: Side,
+) {
+    /** Where to place the port on the model. */
+    enum class Side(
+        /** The transform matrix to apply to ports' coordinates in the model. */
+        val transform: Affine2x2,
+        /** The model face on which the port is placed. */
+        val face: Direction,
+    ) {
+        Front(
+            transform = Affine2x2(1f, 0f, 0f, 1f),
+            face = Direction.NORTH,
+        ),
+        Back(
+            transform = Affine2x2(-1f, 0f, 0f, -1f, translateX = 16f, translateY = 16f),
+            face = Direction.SOUTH,
+        ),
+    }
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/devices/SpeakerBlockDescriptor.kt b/src/main/kotlin/net/liquidev/dawd3/block/devices/SpeakerBlockDescriptor.kt
new file mode 100644
index 0000000..077cae2
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/devices/SpeakerBlockDescriptor.kt
@@ -0,0 +1,49 @@
+package net.liquidev.dawd3.block.devices
+
+import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.audio.Audio
+import net.liquidev.dawd3.audio.device.DeviceInstance
+import net.liquidev.dawd3.audio.devices.TerminalDevice
+import net.liquidev.dawd3.audio.generator.DeviceGraphGenerator
+import net.liquidev.dawd3.audio.generator.MixGenerator
+import net.liquidev.dawd3.block.device.DeviceBlockDescriptor
+import net.liquidev.dawd3.block.device.PhysicalPort
+import net.minecraft.block.Material
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.sound.BlockSoundGroup
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.Vec2f
+
+object SpeakerBlockDescriptor : DeviceBlockDescriptor<SpeakerBlockDescriptor.ClientState, Unit> {
+    override val id = Identifier(Mod.id, "speaker")
+    override val blockSettings = FabricBlockSettings
+        .of(Material.WOOD)
+        .hardness(2.0f).resistance(6.0f)
+        .sounds(BlockSoundGroup.WOOD)!!
+
+    override val portLayout = arrayOf(
+        PhysicalPort(TerminalDevice.Input, Vec2f(0.5f, 0.5f), PhysicalPort.Side.Back)
+    )
+
+    class ClientState : DeviceBlockDescriptor.ClientState {
+        internal val channel: MixGenerator.Channel<DeviceGraphGenerator>
+        override val logicalDevice: DeviceInstance
+
+        init {
+            val generator = DeviceGraphGenerator()
+            channel = Audio.mixer.createChannel(generator)
+
+            val terminal = generator.terminalDevice
+            logicalDevice = terminal
+
+            generator.rebuildSim()
+        }
+    }
+
+    override fun onClientLoad(world: ClientWorld): ClientState = ClientState()
+
+    override fun onClientUnload(state: ClientState, world: ClientWorld) {
+        state.channel.stop()
+    }
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/entity/D3BlockEntity.kt b/src/main/kotlin/net/liquidev/dawd3/block/entity/D3BlockEntity.kt
new file mode 100644
index 0000000..3e3740f
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/entity/D3BlockEntity.kt
@@ -0,0 +1,18 @@
+package net.liquidev.dawd3.block.entity
+
+import net.minecraft.block.BlockState
+import net.minecraft.block.entity.BlockEntity
+import net.minecraft.block.entity.BlockEntityType
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+
+abstract class D3BlockEntity(
+    type: BlockEntityType<out D3BlockEntity>,
+    pos: BlockPos,
+    state: BlockState,
+) :
+    BlockEntity(type, pos, state) {
+
+    open fun onClientLoad(world: ClientWorld) {}
+    open fun onClientUnload(world: ClientWorld) {}
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/block/entity/blockEntityEvents.kt b/src/main/kotlin/net/liquidev/dawd3/block/entity/blockEntityEvents.kt
new file mode 100644
index 0000000..167bdd5
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/block/entity/blockEntityEvents.kt
@@ -0,0 +1,17 @@
+package net.liquidev.dawd3.block.entity
+
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientBlockEntityEvents
+
+fun registerBlockEntityEvents() {
+    ClientBlockEntityEvents.BLOCK_ENTITY_LOAD.register { blockEntity, world ->
+        if (blockEntity is D3BlockEntity) {
+            blockEntity.onClientLoad(world)
+        }
+    }
+
+    ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register { blockEntity, world ->
+        if (blockEntity is D3BlockEntity) {
+            blockEntity.onClientUnload(world)
+        }
+    }
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/common/Affine2x2.kt b/src/main/kotlin/net/liquidev/dawd3/common/Affine2x2.kt
new file mode 100644
index 0000000..b5994c6
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/common/Affine2x2.kt
@@ -0,0 +1,23 @@
+package net.liquidev.dawd3.common
+
+import net.minecraft.util.math.Vec2f
+import net.minecraft.util.math.Vec3f
+
+/** 2x2 matrix. */
+data class Affine2x2(
+    val xx: Float,
+    val xy: Float,
+    val yx: Float,
+    val yy: Float,
+    val translateX: Float = 0f,
+    val translateY: Float = 0f,
+) {
+    operator fun times(vec: Vec2f): Vec2f =
+        Vec2f(vec.x * xx + vec.y * xy + translateX, vec.y * yx + vec.y * yy + translateY)
+
+    fun timesXZ(vec: Vec3f): Vec3f {
+        val vecXZ = Vec2f(vec.x, vec.z)
+        val u = times(vecXZ)
+        return Vec3f(u.x, vec.y, u.y)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/common/TaskQueue.kt b/src/main/kotlin/net/liquidev/dawd3/common/TaskQueue.kt
new file mode 100644
index 0000000..4278782
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/common/TaskQueue.kt
@@ -0,0 +1,18 @@
+package net.liquidev.dawd3.common
+
+import java.util.concurrent.Executor
+
+class TaskQueue : Executor {
+    private val tasks = arrayListOf<Runnable>()
+
+    override fun execute(task: Runnable) {
+        tasks.add(task)
+    }
+
+    fun flush() {
+        for (task in tasks) {
+            task.run()
+        }
+        tasks.clear()
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/common/math.kt b/src/main/kotlin/net/liquidev/dawd3/common/math.kt
new file mode 100644
index 0000000..631d243
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/common/math.kt
@@ -0,0 +1,14 @@
+package net.liquidev.dawd3.common
+
+import net.minecraft.util.math.Vec2f
+import net.minecraft.util.math.Vec3f
+import kotlin.math.max
+import kotlin.math.min
+
+operator fun Vec2f.plus(other: Vec2f): Vec2f = Vec2f(x + other.x, y + other.y)
+operator fun Vec2f.minus(other: Vec2f): Vec2f = Vec2f(x - other.x, y - other.y)
+operator fun Vec2f.times(other: Vec2f): Vec2f = Vec2f(x * other.x, y * other.y)
+operator fun Vec2f.div(other: Vec2f): Vec2f = Vec2f(x / other.x, y / other.y)
+
+fun Vec3f.min(other: Vec3f): Vec3f = Vec3f(min(x, other.x), min(y, other.y), min(z, other.z))
+fun Vec3f.max(other: Vec3f): Vec3f = Vec3f(max(x, other.x), max(y, other.y), max(z, other.z))
diff --git a/src/main/kotlin/net/liquidev/dawd3/datagen/Datagen.kt b/src/main/kotlin/net/liquidev/dawd3/datagen/Datagen.kt
new file mode 100644
index 0000000..be1b4d8
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/datagen/Datagen.kt
@@ -0,0 +1,14 @@
+package net.liquidev.dawd3.datagen
+
+import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
+import net.liquidev.dawd3.Mod
+
+object Datagen : DataGeneratorEntrypoint {
+    private val logger = Mod.logger<Datagen>()
+
+    override fun onInitializeDataGenerator(datagen: FabricDataGenerator) {
+        logger.info("initializing data generator")
+        datagen.addProvider(::ModelDatagen)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/datagen/ModelDatagen.kt b/src/main/kotlin/net/liquidev/dawd3/datagen/ModelDatagen.kt
new file mode 100644
index 0000000..dd44313
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/datagen/ModelDatagen.kt
@@ -0,0 +1,49 @@
+package net.liquidev.dawd3.datagen
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.block.Blocks
+import net.liquidev.dawd3.datagen.device.DeviceBlockModel
+import net.minecraft.data.client.*
+import net.minecraft.util.Identifier
+import java.util.*
+
+class ModelDatagen(generator: FabricDataGenerator) : FabricModelProvider(generator) {
+    private companion object {
+        val logger = Mod.logger<ModelDatagen>()
+    }
+
+    override fun generateBlockStateModels(generator: BlockStateModelGenerator) {
+        logger.info("generating block state models")
+
+        for ((id, deviceBlock) in Blocks.deviceBlocks) {
+            val modelId = Identifier(Mod.id, "block/${id.path}")
+            generator.modelCollector.accept(modelId) { DeviceBlockModel.generate(id, deviceBlock) }
+            generator.blockStateCollector.accept(horizontallyRotatableBlockState(id, deviceBlock))
+        }
+    }
+
+    private fun horizontallyRotatableBlockState(
+        id: Identifier,
+        deviceBlock: Blocks.RegisteredDeviceBlock,
+    ): BlockStateSupplier {
+        val modelId = Identifier(Mod.id, "block/${id.path}")
+        return VariantsBlockStateSupplier.create(
+            deviceBlock.block,
+            BlockStateVariant.create().put(VariantSettings.MODEL, modelId)
+        )
+            .coordinate(BlockStateModelGenerator.createNorthDefaultHorizontalRotationStates())
+    }
+
+
+    override fun generateItemModels(generator: ItemModelGenerator) {
+        logger.info("generating item models")
+        for ((id, deviceBlock) in Blocks.deviceBlocks) {
+            generator.register(
+                deviceBlock.item.item.item,
+                Model(Optional.of(Identifier(Mod.id, "block/${id.path}")), Optional.empty())
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/datagen/device/DeviceBlockModel.kt b/src/main/kotlin/net/liquidev/dawd3/datagen/device/DeviceBlockModel.kt
new file mode 100644
index 0000000..10c6924
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/datagen/device/DeviceBlockModel.kt
@@ -0,0 +1,99 @@
+package net.liquidev.dawd3.datagen.device
+
+import com.google.gson.JsonObject
+import net.liquidev.dawd3.Mod
+import net.liquidev.dawd3.block.Blocks
+import net.liquidev.dawd3.block.device.PhysicalPort
+import net.liquidev.dawd3.common.*
+import net.liquidev.dawd3.datagen.json.element
+import net.liquidev.dawd3.datagen.json.face
+import net.liquidev.dawd3.datagen.json.faces
+import net.liquidev.dawd3.datagen.json.uvRect
+import net.liquidev.dawd3.datagen.jsonArray
+import net.liquidev.dawd3.datagen.jsonObject
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.Vec2f
+import net.minecraft.util.math.Vec3f
+
+object DeviceBlockModel {
+    private val portSize = Vec2f(3f, 3f)
+    private const val portTexture = "${Mod.id}:device/port"
+
+    private fun getSideTexture(id: Identifier) =
+        "${Mod.id}:block/${id.path}_side"
+
+    private fun getFrontTexture(id: Identifier) =
+        "${Mod.id}:block/${id.path}_front"
+
+    fun generate(
+        id: Identifier,
+        deviceBlock: Blocks.RegisteredDeviceBlock,
+    ): JsonObject {
+        return jsonObject {
+            add("parent", "block/block")
+
+            add("textures", jsonObject {
+                add("side", getSideTexture(id))
+                add("front", getFrontTexture(id))
+                add("port", portTexture)
+                add("particle", "#side")
+            })
+
+            add("elements", jsonArray {
+                add(blockElement)
+
+                val descriptor = deviceBlock.descriptor
+                for (port in descriptor.portLayout) {
+                    add(getPortElement(port))
+                }
+            })
+        }
+    }
+
+    private val blockElement = element(
+        from = Vec3f(0f, 0f, 0f),
+        to = Vec3f(16f, 16f, 16f),
+        faces = faces(
+            north = face(texture = "#front", cullface = "north"),
+            east = face(texture = "#side", cullface = "east"),
+            south = face(texture = "#side", cullface = "south"),
+            west = face(texture = "#side", cullface = "west"),
+            up = face(texture = "#side", cullface = "up"),
+            down = face(texture = "#side", cullface = "down"),
+        )
+    )
+
+    private val portPlayArea = Vec2f(16f, 16f) - portSize
+    private fun relativeToAbsolutePortPosition(position: Vec2f): Vec2f {
+        val inv = Vec2f(1f - position.x, 1f - position.y)
+        return inv * portPlayArea
+    }
+
+    private fun getPortElement(port: PhysicalPort): JsonObject {
+        val bottomLeft2D = relativeToAbsolutePortPosition(port.position)
+        val topRight2D = bottomLeft2D + portSize
+        val bottomLeft = Vec3f(bottomLeft2D.x, bottomLeft2D.y, -0.01f)
+        val topRight = Vec3f(topRight2D.x, topRight2D.y, 0.01f)
+
+        val rotatedBottomLeft = port.side.transform.timesXZ(bottomLeft)
+        val rotatedTopRight = port.side.transform.timesXZ(topRight)
+
+        val min = rotatedBottomLeft.min(rotatedTopRight)
+        val max = rotatedBottomLeft.max(rotatedTopRight)
+
+        return element(
+            from = min,
+            to = max,
+            faces = jsonObject {
+                val faceName = port.side.face.getName()
+                add(
+                    faceName, face(
+                        texture = "#port",
+                        cullface = faceName,
+                        uv = uvRect(0f, 0f, 4f, 4f)
+                    )
+                )
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/datagen/json/json.kt b/src/main/kotlin/net/liquidev/dawd3/datagen/json/json.kt
new file mode 100644
index 0000000..b763992
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/datagen/json/json.kt
@@ -0,0 +1,74 @@
+package net.liquidev.dawd3.datagen
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import net.minecraft.util.math.Vec3f
+
+class JsonObjectBuilder {
+    private val obj = JsonObject()
+
+    fun add(key: String, value: Boolean) =
+        obj.add(key, JsonPrimitive(value))
+
+    fun add(key: String, value: Int) =
+        obj.add(key, JsonPrimitive(value))
+
+    fun add(key: String, value: Float) =
+        obj.add(key, JsonPrimitive(value))
+
+    fun add(key: String, value: String) =
+        obj.add(key, JsonPrimitive(value))
+
+    fun add(key: String, value: JsonObject) =
+        obj.add(key, value)
+
+    fun add(key: String, value: JsonArray) =
+        obj.add(key, value)
+
+    fun build(): JsonObject = obj
+}
+
+class JsonArrayBuilder {
+    private val array = JsonArray()
+
+    fun add(value: Boolean) =
+        array.add(JsonPrimitive(value))
+
+    fun add(value: Int) =
+        array.add(JsonPrimitive(value))
+
+    fun add(value: Float) =
+        array.add(JsonPrimitive(value))
+
+    fun add(value: String) =
+        array.add(JsonPrimitive(value))
+
+    fun add(value: JsonObject) =
+        array.add(value)
+
+    fun add(value: JsonArray) =
+        array.add(value)
+
+    fun build(): JsonArray = array
+}
+
+fun jsonObject(build: JsonObjectBuilder.() -> Unit): JsonObject {
+    val builder = JsonObjectBuilder()
+    with(builder, build)
+    return builder.build()
+}
+
+fun jsonArray(build: JsonArrayBuilder.() -> Unit): JsonArray {
+    val builder = JsonArrayBuilder()
+    with(builder, build)
+    return builder.build()
+}
+
+fun Vec3f.toJson(): JsonArray {
+    return jsonArray {
+        add(x)
+        add(y)
+        add(z)
+    }
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/datagen/json/model.kt b/src/main/kotlin/net/liquidev/dawd3/datagen/json/model.kt
new file mode 100644
index 0000000..19ff741
--- /dev/null
+++ b/src/main/kotlin/net/liquidev/dawd3/datagen/json/model.kt
@@ -0,0 +1,61 @@
+package net.liquidev.dawd3.datagen.json
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import net.liquidev.dawd3.datagen.jsonArray
+import net.liquidev.dawd3.datagen.jsonObject
+import net.liquidev.dawd3.datagen.toJson
+import net.minecraft.util.math.Vec3f
+
+fun element(
+    from: Vec3f,
+    to: Vec3f,
+    faces: JsonObject,
+): JsonObject {
+    return jsonObject {
+        add("from", from.toJson())
+        add("to", to.toJson())
+        add("faces", faces)
+    }
+}
+
+fun faces(
+    north: JsonObject? = null,
+    east: JsonObject? = null,
+    south: JsonObject? = null,
+    west: JsonObject? = null,
+    up: JsonObject? = null,
+    down: JsonObject? = null,
+): JsonObject {
+    return jsonObject {
+        if (north != null) add("north", north)
+        if (east != null) add("east", east)
+        if (south != null) add("south", south)
+        if (west != null) add("west", west)
+        if (up != null) add("up", up)
+        if (down != null) add("down", down)
+    }
+}
+
+fun uvRect(x1: Float, y1: Float, x2: Float, y2: Float): JsonArray {
+    return jsonArray {
+        add(x1)
+        add(y1)
+        add(x2)
+        add(y2)
+    }
+}
+
+fun face(
+    uv: JsonArray? = null,
+    texture: String,
+    cullface: String? = null,
+    rotation: Int? = null,
+): JsonObject {
+    return jsonObject {
+        if (uv != null) add("uv", uv)
+        add("texture", texture)
+        if (cullface != null) add("cullface", cullface)
+        if (rotation != null) add("rotation", rotation)
+    }
+}
diff --git a/src/main/kotlin/net/liquidev/dawd3/item/Items.kt b/src/main/kotlin/net/liquidev/dawd3/item/Items.kt
index 2b1b18e..9bdb6ef 100644
--- a/src/main/kotlin/net/liquidev/dawd3/item/Items.kt
+++ b/src/main/kotlin/net/liquidev/dawd3/item/Items.kt
@@ -30,14 +30,20 @@ object Items {
         .build()
 
     // Icon for creative tab
-    val dawd3 = registry.add("dawd3", RegisteredItem(Item(FabricItemSettings())).hiddenFromCreativeTab())
+    val dawd3 = registry.add(
+        Identifier(Mod.id, "dawd3"),
+        RegisteredItem(Item(FabricItemSettings())).hiddenFromCreativeTab()
+    )
 
     // Tools
-    val patchCable = addItem("patch_cable", PatchCable(FabricItemSettings().group(ItemGroup.REDSTONE)))
+    val patchCable =
+        addItem("patch_cable", PatchCable(FabricItemSettings().group(ItemGroup.REDSTONE)))
 
-    fun addItem(name: String, item: Item) {
+    fun addItem(name: Identifier, item: Item): D3Registry.Registered<RegisteredItem> =
         registry.add(name, RegisteredItem(item))
-    }
+
+    fun addItem(name: String, item: Item) =
+        addItem(Identifier(Mod.id, name), item)
 
     data class RegisteredItem(
         val item: Item,
diff --git a/src/main/kotlin/net/liquidev/dawd3/mixin/SoundManagerAccessor.kt b/src/main/kotlin/net/liquidev/dawd3/mixin/SoundManagerAccessor.kt
deleted file mode 100644
index 812c20e..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/mixin/SoundManagerAccessor.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.liquidev.dawd3.mixin
-
-import net.minecraft.client.sound.SoundManager
-import net.minecraft.client.sound.SoundSystem
-import org.spongepowered.asm.mixin.Mixin
-import org.spongepowered.asm.mixin.gen.Accessor
-
-@Mixin(SoundManager::class)
-interface SoundManagerAccessor {
-    @Accessor
-    fun getSoundSystem(): SoundSystem
-}
diff --git a/src/main/kotlin/net/liquidev/dawd3/mixin/SoundSystemAccessor.kt b/src/main/kotlin/net/liquidev/dawd3/mixin/SoundSystemAccessor.kt
deleted file mode 100644
index 1b873cc..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/mixin/SoundSystemAccessor.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.liquidev.dawd3.mixin
-
-import net.minecraft.client.sound.Channel
-import net.minecraft.client.sound.SoundSystem
-import org.spongepowered.asm.mixin.Mixin
-import org.spongepowered.asm.mixin.gen.Accessor
-
-@Mixin(SoundSystem::class)
-interface SoundSystemAccessor {
-    @Accessor
-    fun getChannel(): Channel
-}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/sound/AudioGenerator.kt b/src/main/kotlin/net/liquidev/dawd3/sound/AudioGenerator.kt
deleted file mode 100644
index 5446ce1..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/sound/AudioGenerator.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.liquidev.dawd3.sound
-
-import net.liquidev.d3r.AudioOutputStream
-
-abstract class AudioGenerator : AudioOutputStream {
-    private var outputBuffer: FloatArray? = null
-
-    private fun allocateOutputBuffer(sampleCount: Int): FloatArray {
-        val inOutputBuffer = outputBuffer
-        if (inOutputBuffer == null || inOutputBuffer.size < sampleCount) {
-            outputBuffer = FloatArray(sampleCount)
-        }
-        return outputBuffer!!
-    }
-
-    abstract fun generate(output: FloatArray, sampleCount: Int, channels: Int)
-
-    override fun getOutputBuffer(sampleCount: Int, channels: Int): FloatArray {
-        val outputBuffer = allocateOutputBuffer(sampleCount)
-        generate(outputBuffer, sampleCount, channels)
-        return outputBuffer
-    }
-
-    override fun error(message: String) {
-        println("Error reported by audio stream: $message")
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/net/liquidev/dawd3/sound/Sound.kt b/src/main/kotlin/net/liquidev/dawd3/sound/Sound.kt
deleted file mode 100644
index 18ef4cc..0000000
--- a/src/main/kotlin/net/liquidev/dawd3/sound/Sound.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.liquidev.dawd3.sound
-
-import net.liquidev.d3r.D3r
-
-/** Common sound utilities. */
-object Sound {
-    const val sampleRate = 48000
-    private const val bufferSize = 256
-
-    val outputDeviceId: Int
-    val outputStreamId: Int
-
-    init {
-        D3r.openDefaultHost()
-        outputDeviceId = D3r.openDefaultOutputDevice()
-        outputStreamId = D3r.openOutputStream(
-            outputDeviceId,
-            sampleRate,
-            1,
-            bufferSize,
-            SineOscGenerator(frequency = 440.0f, amplitude = 0.5f)
-        )
-        D3r.startPlayback(outputStreamId)
-    }
-
-    fun forceInitializationNow() {}
-
-    fun deinitialize() {
-        D3r.closeOutputStream(outputStreamId)
-        D3r.closeOutputDevice(outputDeviceId)
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/dawd3/blockstates/speaker.json b/src/main/resources/assets/dawd3/blockstates/speaker.json
deleted file mode 100644
index 0016ef0..0000000
--- a/src/main/resources/assets/dawd3/blockstates/speaker.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "facing=north": { "model": "dawd3:block/speaker" },
-    "facing=east":  { "model": "dawd3:block/speaker", "y": 90 },
-    "facing=south": { "model": "dawd3:block/speaker", "y": 180 },
-    "facing=west":  { "model": "dawd3:block/speaker", "y": 270 }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/dawd3/lang/en_us.json b/src/main/resources/assets/dawd3/lang/en_us.json
index 00510bb..bfca37e 100644
--- a/src/main/resources/assets/dawd3/lang/en_us.json
+++ b/src/main/resources/assets/dawd3/lang/en_us.json
@@ -1,3 +1,5 @@
 {
-  "item.dawd3.patch_cable": "Patch Cable"
+  "itemGroup.dawd3.main": "dawd³",
+  "item.dawd3.patch_cable": "Patch Cable",
+  "block.dawd3.speaker": "Speaker"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/dawd3/models/block/speaker.json b/src/main/resources/assets/dawd3/models/block/speaker.json
deleted file mode 100644
index 7a6ef38..0000000
--- a/src/main/resources/assets/dawd3/models/block/speaker.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "dawd3:block/module_with_front",
-  "textures": {
-    "front": "dawd3:block/speaker_front"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/dawd3/textures/block/module_side.png b/src/main/resources/assets/dawd3/textures/block/module_side.png
deleted file mode 100644
index f47fc1d829bc9b8f1d974c257ba2515e0c81032f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z+mp_
z;uvDlo4lvy`P2W0m#;INz?^e-i$nz9{9VT`T)yKqjge>TRUV%wFI^e}nca9LOc|IY
dG|!%6I4UP(cPID2VFm^U22WQ%mvv4FO#r@gDB1u3

diff --git a/src/main/resources/assets/dawd3/textures/block/speaker_front.png b/src/main/resources/assets/dawd3/textures/block/speaker_front.png
index 38806f8d6abe11d2296c5d995516bbe70787d813..d202ac532130c57672798df5717b2acae914dcd0 100644
GIT binary patch
delta 281
zcmbQrxRPmtWIZzj1A~Sxe=q|B17mTJyA#8@b22X(7#N%ad_r6q7#I%CP1-Rfetm!F
z{1)G7C60AT=IH@CvNAG;`nvvJu2m(ubLY<0)KFkxV9?Z1FxA(NGEs=K(X0-zoD%CO
zAu7UpYJCC&1A|yekY6yve`EmR)&KurbgCO<QL(3sV~E7m*#1Di0}33@e_6zZ+;;wt
z40oBHDsgn5!-B(S_Uaw}u`#inVPn%vHI9^J1~UZgY=o48mv<>hcf{EQhYFpWHYIy9
zZ^ZpsEe9^j-WBGq(UMy8zeYRj)J4wh3%^)ne7uV`&iWMpcgEqW(|5kry|K6bBgDJt
V=){*#85kHCJYD@<);T3K0RT5ib2<P3

delta 131
zcmZ3<G?j6JWDOew1B3kM|A`C?42;D=?oJHr&dI!FU|{g~ba4!^=uO^J^Ze=m!^_th
zPGHVCyG0^`Z~m@h7cSrNn#Rbp^(v3gi=_8)_6l8Xj3UhU_SPLxP+8?L;aDbv;Vk!9
ogI7$yb~H#xNg4#rn#(wA!!f)1`449>FfcH9y85}Sb4q9e04Y^8d;kCd

diff --git a/src/main/resources/assets/dawd3/textures/block/speaker_side.png b/src/main/resources/assets/dawd3/textures/block/speaker_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9637e0da1958faf5cc9abb3477972703fc13e97
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z;MUY
z#WBR9_vqxkd`$)-Zu~6HoNE&kCit4k*8Xq*ASe+j;iIv!m(xnbqw|Nf@cApt_HMtw
z_j~q+`?>2GjQkicY&(4acgAhS$0fU%1sG*i6sk_yFkcHf%lRVx;AZ2g4VJ}MoS9sl
zW~PgHF$AnQd-t_+>#cz8ZL1h7IXmZEndij$>Y5GD9Cg8v-stvxSDgo5O&9V{nAfaL
z@KShOGU+pCUeNx450hCI&+*sz%#*v@e!9Zrk_|=y+tW6E(w;Nb-@#)^F1t2c_O8NT
uwjbSXUQe}LtjqGaTu#+C`K9%JhKl8WVppOIelsvIFnGH9xvX<aXaWGKHgfC$

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/dawd3/textures/device/port.png b/src/main/resources/assets/dawd3/textures/device/port.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b3bd3005352e8d31e845cfbc22241fb755a7020
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*T#^NA%Cx&(BWL`2bFz^TX
zgt#&=Fxc7I@$&K}CMNC>;n_PQ^%DaF18Yf;UogY}|NsBXTu=j<B<1Pi7$Pw>IUyx2
pEyaQDjE~QmAFKvjc$66!loJ?K9d>MA$iTqB;OXk;vd$@?2>?ZeBiH}{

literal 0
HcmV?d00001

diff --git a/src/main/resources/dawd3.mixins.json b/src/main/resources/dawd3.mixins.json
index 42a5c47..757574c 100644
--- a/src/main/resources/dawd3.mixins.json
+++ b/src/main/resources/dawd3.mixins.json
@@ -6,7 +6,5 @@
     "defaultRequire": 1
   },
   "mixins": [
-    "SoundManagerAccessor",
-    "SoundSystemAccessor"
   ]
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7ef8c28..5c7ba06 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,6 +27,12 @@
         "adapter": "kotlin",
         "value": "net.liquidev.dawd3.Mod"
       }
+    ],
+    "fabric-datagen": [
+      {
+        "adapter": "kotlin",
+        "value": "net.liquidev.dawd3.datagen.Datagen"
+      }
     ]
   },
   "mixins": [