From 337c9d08e12277d24fb3943cf8e7ecbf393cc504 Mon Sep 17 00:00:00 2001 From: lqdev Date: Sun, 27 Nov 2022 22:04:26 +0100 Subject: [PATCH] update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i suck at git. to whoever is reading this in the future, please excuse this absolutely terrible commit message and know that i'm doing my best. cheers & love. once dawd³ is in a better shape these commit messages will get better. for now they're terrible because the sheer amount of experimentation makes me forget that i have to `git commit` my work every so often. --- build.gradle.kts | 2 + proj/block/fader_bottom.ase | Bin 0 -> 617 bytes proj/block/fader_handle.ase | Bin 0 -> 617 bytes proj/block/fader_side.ase | Bin 0 -> 680 bytes proj/block/fader_top.ase | Bin 0 -> 435 bytes proj/block/sine_oscillator_front.ase | Bin 0 -> 639 bytes proj/block/sine_oscillator_side.ase | Bin 0 -> 457 bytes proj/block/template/device_side.ase | Bin 0 -> 370 bytes proj/cable_color_palette.ase | Bin 0 -> 646 bytes proj/device/cable.ase | Bin 0 -> 656 bytes proj/device/port.ase | Bin 324 -> 638 bytes proj/item/black_patch_cable.ase | Bin 0 -> 673 bytes proj/item/blue_patch_cable.ase | Bin 0 -> 671 bytes proj/item/brown_patch_cable.ase | Bin 0 -> 673 bytes proj/item/cyan_patch_cable.ase | Bin 0 -> 672 bytes proj/item/gray_patch_cable.ase | Bin 0 -> 683 bytes proj/item/green_patch_cable.ase | Bin 0 -> 671 bytes proj/item/light_blue_patch_cable.ase | Bin 0 -> 672 bytes proj/item/light_gray_patch_cable.ase | Bin 0 -> 676 bytes proj/item/lime_patch_cable.ase | Bin 0 -> 672 bytes proj/item/magenta_patch_cable.ase | Bin 0 -> 673 bytes proj/item/orange_patch_cable.ase | Bin 0 -> 673 bytes proj/item/pink_patch_cable.ase | Bin 0 -> 670 bytes proj/item/purple_patch_cable.ase | Bin 0 -> 673 bytes proj/item/red_patch_cable.ase | Bin 0 -> 673 bytes proj/item/white_patch_cable.ase | Bin 0 -> 677 bytes proj/item/yellow_patch_cable.ase | Bin 0 -> 672 bytes .../f3798f81c7b6fecad2cbfec741314f8a66c0eca3 | 28 +- .../assets/dawd3/blockstates/fader.json | 19 + .../dawd3/blockstates/sine_oscillator.json | 19 + .../assets/dawd3/models/block/fader.json | 77 ++++ .../dawd3/models/block/sine_oscillator.json | 101 +++++ .../assets/dawd3/models/block/speaker.json | 26 +- .../dawd3/models/item/black_patch_cable.json | 6 + .../dawd3/models/item/blue_patch_cable.json | 6 + .../dawd3/models/item/brown_patch_cable.json | 6 + .../dawd3/models/item/cyan_patch_cable.json | 6 + .../assets/dawd3/models/item/fader.json | 3 + .../dawd3/models/item/gray_patch_cable.json | 6 + .../dawd3/models/item/green_patch_cable.json | 6 + .../models/item/light_blue_patch_cable.json | 6 + .../models/item/light_gray_patch_cable.json | 6 + .../dawd3/models/item/lime_patch_cable.json | 6 + .../models/item/magenta_patch_cable.json | 6 + .../dawd3/models/item/orange_patch_cable.json | 6 + .../dawd3/models/item/pink_patch_cable.json | 6 + .../dawd3/models/item/purple_patch_cable.json | 6 + .../dawd3/models/item/red_patch_cable.json | 6 + .../dawd3/models/item/sine_oscillator.json | 3 + .../dawd3/models/item/white_patch_cable.json | 6 + .../dawd3/models/item/yellow_patch_cable.json | 6 + src/main/kotlin/net/liquidev/dawd3/Mod.kt | 7 +- .../kotlin/net/liquidev/dawd3/audio/Audio.kt | 10 +- .../net/liquidev/dawd3/audio/device/Device.kt | 4 +- .../dawd3/audio/device/DeviceDescriptor.kt | 7 + .../dawd3/audio/device/DeviceInstance.kt | 11 +- .../liquidev/dawd3/audio/device/Devices.kt | 83 +++- .../dawd3/audio/device/ProcessingState.kt | 9 + .../net/liquidev/dawd3/audio/device/Sim.kt | 45 -- .../net/liquidev/dawd3/audio/device/ports.kt | 77 +++- .../dawd3/audio/devices/ConstantDevice.kt | 14 +- .../audio/devices/SineOscillatorDevice.kt | 26 +- .../dawd3/audio/devices/TerminalDevice.kt | 14 +- .../audio/generator/DeviceGraphGenerator.kt | 16 +- .../generator/GeneratorWithProcessingState.kt | 16 + .../dawd3/audio/generator/MixGenerator.kt | 10 +- .../dawd3/audio/generator/SineOscGenerator.kt | 3 +- .../kotlin/net/liquidev/dawd3/block/Blocks.kt | 26 ++ .../dawd3/block/device/DeviceBlock.kt | 47 +- .../block/device/DeviceBlockDescriptor.kt | 11 +- .../dawd3/block/device/DeviceBlockEntity.kt | 136 +++++- .../block/device/DeviceBlockEntityRenderer.kt | 401 ++++++++++++++++++ .../dawd3/block/device/PhysicalPort.kt | 69 ++- .../block/device/descriptor/FaceTextures.kt | 40 ++ .../liquidev/dawd3/block/device/exceptions.kt | 3 + .../block/devices/FaderBlockDescriptor.kt | 33 ++ .../devices/SineOscillatorBlockDescriptor.kt | 33 ++ .../block/devices/SpeakerBlockDescriptor.kt | 11 +- .../dawd3/block/entity/D3BlockEntity.kt | 15 +- .../dawd3/block/entity/blockEntityEvents.kt | 2 +- .../common/{Affine2x2.kt => Affine2x2f.kt} | 2 +- .../net/liquidev/dawd3/common/Mat2x3f.kt | 20 + .../net/liquidev/dawd3/common/Mat3x2f.kt | 21 + .../net/liquidev/dawd3/common/TaskQueue.kt | 12 +- .../kotlin/net/liquidev/dawd3/common/math.kt | 137 +++++- .../kotlin/net/liquidev/dawd3/common/world.kt | 10 + .../liquidev/dawd3/datagen/ModelDatagen.kt | 17 +- .../dawd3/datagen/device/DeviceBlockModel.kt | 73 ++-- .../net/liquidev/dawd3/item/BasicItem.kt | 6 + .../kotlin/net/liquidev/dawd3/item/Items.kt | 25 +- .../net/liquidev/dawd3/item/PatchCable.kt | 16 - .../net/liquidev/dawd3/item/PatchCableItem.kt | 141 ++++++ .../liquidev/dawd3/mixin/NonModelTextures.kt | 27 ++ .../net/liquidev/dawd3/net/ConnectPorts.kt | 88 ++++ .../kotlin/net/liquidev/dawd3/net/Packets.kt | 8 + .../dawd3/net/StartConnectingPorts.kt | 62 +++ .../net/liquidev/dawd3/render/Textures.kt | 19 + .../dawd3/blockstates/patch_cable_plug.json | 5 + .../resources/assets/dawd3/lang/en_us.json | 17 +- .../dawd3/models/block/module_with_front.json | 21 - .../dawd3/models/device/patch_cable_plug.json | 20 + .../dawd3/textures/block/fader_bottom.png | Bin 0 -> 143 bytes .../dawd3/textures/block/fader_handle.png | Bin 0 -> 141 bytes .../dawd3/textures/block/fader_side.png | Bin 0 -> 237 bytes .../assets/dawd3/textures/block/fader_top.png | Bin 0 -> 228 bytes .../assets/dawd3/textures/block/port.png | Bin 0 -> 164 bytes .../textures/block/sine_oscillator_front.png | Bin 0 -> 296 bytes .../textures/block/sine_oscillator_side.png | Bin 0 -> 199 bytes .../assets/dawd3/textures/device/cable.png | Bin 0 -> 161 bytes .../assets/dawd3/textures/device/port.png | Bin 140 -> 207 bytes .../dawd3/textures/item/black_patch_cable.png | Bin 0 -> 238 bytes .../dawd3/textures/item/blue_patch_cable.png | Bin 0 -> 242 bytes .../dawd3/textures/item/brown_patch_cable.png | Bin 0 -> 247 bytes .../dawd3/textures/item/cyan_patch_cable.png | Bin 0 -> 241 bytes .../dawd3/textures/item/gray_patch_cable.png | Bin 0 -> 258 bytes .../dawd3/textures/item/green_patch_cable.png | Bin 0 -> 242 bytes .../textures/item/light_blue_patch_cable.png | Bin 0 -> 227 bytes .../textures/item/light_gray_patch_cable.png | Bin 0 -> 264 bytes .../dawd3/textures/item/lime_patch_cable.png | Bin 0 -> 246 bytes .../textures/item/magenta_patch_cable.png | Bin 0 -> 247 bytes .../textures/item/orange_patch_cable.png | Bin 0 -> 247 bytes .../dawd3/textures/item/pink_patch_cable.png | Bin 0 -> 245 bytes .../textures/item/purple_patch_cable.png | Bin 0 -> 262 bytes .../dawd3/textures/item/red_patch_cable.png | Bin 0 -> 245 bytes .../dawd3/textures/item/white_patch_cable.png | Bin 0 -> 229 bytes .../textures/item/yellow_patch_cable.png | Bin 0 -> 237 bytes src/main/resources/dawd3.accesswidener | 14 + src/main/resources/dawd3.mixins.json | 1 + src/main/resources/fabric.mod.json | 1 + 129 files changed, 2072 insertions(+), 244 deletions(-) create mode 100644 proj/block/fader_bottom.ase create mode 100644 proj/block/fader_handle.ase create mode 100644 proj/block/fader_side.ase create mode 100644 proj/block/fader_top.ase create mode 100644 proj/block/sine_oscillator_front.ase create mode 100644 proj/block/sine_oscillator_side.ase create mode 100644 proj/block/template/device_side.ase create mode 100644 proj/cable_color_palette.ase create mode 100644 proj/device/cable.ase create mode 100644 proj/item/black_patch_cable.ase create mode 100644 proj/item/blue_patch_cable.ase create mode 100644 proj/item/brown_patch_cable.ase create mode 100644 proj/item/cyan_patch_cable.ase create mode 100644 proj/item/gray_patch_cable.ase create mode 100644 proj/item/green_patch_cable.ase create mode 100644 proj/item/light_blue_patch_cable.ase create mode 100644 proj/item/light_gray_patch_cable.ase create mode 100644 proj/item/lime_patch_cable.ase create mode 100644 proj/item/magenta_patch_cable.ase create mode 100644 proj/item/orange_patch_cable.ase create mode 100644 proj/item/pink_patch_cable.ase create mode 100644 proj/item/purple_patch_cable.ase create mode 100644 proj/item/red_patch_cable.ase create mode 100644 proj/item/white_patch_cable.ase create mode 100644 proj/item/yellow_patch_cable.ase create mode 100644 src/main/generated/assets/dawd3/blockstates/fader.json create mode 100644 src/main/generated/assets/dawd3/blockstates/sine_oscillator.json create mode 100644 src/main/generated/assets/dawd3/models/block/fader.json create mode 100644 src/main/generated/assets/dawd3/models/block/sine_oscillator.json create mode 100644 src/main/generated/assets/dawd3/models/item/black_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/blue_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/brown_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/cyan_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/fader.json create mode 100644 src/main/generated/assets/dawd3/models/item/gray_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/green_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/light_blue_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/light_gray_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/lime_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/magenta_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/orange_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/pink_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/purple_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/red_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/sine_oscillator.json create mode 100644 src/main/generated/assets/dawd3/models/item/white_patch_cable.json create mode 100644 src/main/generated/assets/dawd3/models/item/yellow_patch_cable.json create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/DeviceDescriptor.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/ProcessingState.kt delete mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/device/Sim.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/audio/generator/GeneratorWithProcessingState.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/DeviceBlockEntityRenderer.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/descriptor/FaceTextures.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/device/exceptions.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/devices/FaderBlockDescriptor.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/block/devices/SineOscillatorBlockDescriptor.kt rename src/main/kotlin/net/liquidev/dawd3/common/{Affine2x2.kt => Affine2x2f.kt} (96%) create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/Mat2x3f.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/Mat3x2f.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/common/world.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/item/BasicItem.kt delete mode 100644 src/main/kotlin/net/liquidev/dawd3/item/PatchCable.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/item/PatchCableItem.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/mixin/NonModelTextures.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/net/ConnectPorts.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/net/Packets.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/net/StartConnectingPorts.kt create mode 100644 src/main/kotlin/net/liquidev/dawd3/render/Textures.kt create mode 100644 src/main/resources/assets/dawd3/blockstates/patch_cable_plug.json delete mode 100644 src/main/resources/assets/dawd3/models/block/module_with_front.json create mode 100644 src/main/resources/assets/dawd3/models/device/patch_cable_plug.json create mode 100644 src/main/resources/assets/dawd3/textures/block/fader_bottom.png create mode 100644 src/main/resources/assets/dawd3/textures/block/fader_handle.png create mode 100644 src/main/resources/assets/dawd3/textures/block/fader_side.png create mode 100644 src/main/resources/assets/dawd3/textures/block/fader_top.png create mode 100644 src/main/resources/assets/dawd3/textures/block/port.png create mode 100644 src/main/resources/assets/dawd3/textures/block/sine_oscillator_front.png create mode 100644 src/main/resources/assets/dawd3/textures/block/sine_oscillator_side.png create mode 100644 src/main/resources/assets/dawd3/textures/device/cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/black_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/blue_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/brown_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/cyan_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/gray_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/green_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/light_blue_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/light_gray_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/lime_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/magenta_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/orange_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/pink_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/purple_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/red_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/white_patch_cable.png create mode 100644 src/main/resources/assets/dawd3/textures/item/yellow_patch_cable.png create mode 100644 src/main/resources/dawd3.accesswidener diff --git a/build.gradle.kts b/build.gradle.kts index 570a3ef..daabca3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,6 +55,8 @@ loom { runDir("build/datagen") } } + + accessWidenerPath.set(file("src/main/resources/dawd3.accesswidener")) } sourceSets.named(mainSourceSet.name) { diff --git a/proj/block/fader_bottom.ase b/proj/block/fader_bottom.ase new file mode 100644 index 0000000000000000000000000000000000000000..3812a068b88e42f158db428ca4a7d9aad3845991 GIT binary patch literal 617 zcmc~~Vqkc%l#xMzL4ZMlfsuiMA%y`MC^ImE1Q|FOIFN;@#(v4j!0_uME7(?61_lN( z1_lOp1+bM!cD!L=V31T$hKeXbX=LjE|NsBN{QnFLTw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(C6RsYEeK-bdH; Xt^8H{Rr7`ZGS95jJjif+(#;M40@{}i literal 0 HcmV?d00001 diff --git a/proj/block/fader_handle.ase b/proj/block/fader_handle.ase new file mode 100644 index 0000000000000000000000000000000000000000..b125df9bd26f178a995ae7f9eadd5c0a4bdaf1e5 GIT binary patch literal 617 zcmc~~Vqkc%l#xMzL4ZMlfsuiMA%y`Ms4y^s1Q|FOIFN;@#(v4j!0_uME7(?61_lN( z1_lOp1+bM!c6?%BV31T$fr=w9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;OVTQ%oD1H-gs`~NdAT)y-2e;ES< z0}CiVK%R#9jf-7{K}D9qMw21bjG^0+?UYyjo1jC#`xsvRXYKpIV6iZRA$Ju+?rUMM z-+q3#4GiXh-B_!|T_7L;a#{ly$WfnF{y$#!dS{1#h>DV?i;+#NM@VUI)tqU|_Fum9 zQXXWh0y8)uAp|H$*cp5hD^rUU3~d+~7+4iR5w9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=yac&{f#H7{0|NsK zC_X@*hWL$(U4=nKmcd4oA=Hea+mY>*SN)ryL%;hNUj1k7`@mqaFoPj?6+`Z8VXxnQ zezy$_=78N;tHoU)AOLb&0~g3qpH==pUiNxthk%HRlBSE1O{_;q>9l40FW-5|z`!66 zvQ>c@9FPzK01_lOJ1&{;>!+$0a4Z;Ep91In6K67aPy?FSj49OZj`_5NE!HLhF3?){pEAwnyqW0RU(Dv-to3 literal 0 HcmV?d00001 diff --git a/proj/block/fader_top.ase b/proj/block/fader_top.ase new file mode 100644 index 0000000000000000000000000000000000000000..edb4ec38c4926ffa7457cf8a3af017f8cf3ce7b7 GIT binary patch literal 435 zcmdnY$iVPmDIJ&&x{}On(-6thQ)|8)SvtWk@!urwd^_HVb!@%&pxR`-~L0(?|KLZ0VFYkW_hKCOy{%2rVyLRn= z28K^_75_6ZeE0D9&%kg*Pw&4H0|NsK$e$eFi;Lyu<#~B|A3l7zcJ10va}~dPcpTBw zlLx6#U`DdzKgdlCK8cm7MGA)arHvrcOgMBKmohLguqr@g|HD;*0>5HT^^Xq^|F;M1 zDSI1bAuWDvdE4~q;yq8FKHYf9pvT|dL)Wfno%|EIl>>gRSsGE#Knyp418=iNo|l3nm?hc#7^_wPnSjY zj8Zexc6oq}WMW`uU_&yJi-CoqV$SBxn}5%rF@xh+nS&X#$blba9-sE?*^|JNboff+ Vlf*{`TaT>Rtb8esA<@~q6aa>YnA-pV literal 0 HcmV?d00001 diff --git a/proj/block/sine_oscillator_side.ase b/proj/block/sine_oscillator_side.ase new file mode 100644 index 0000000000000000000000000000000000000000..7fe731bc5b044ce4d5a260ef97acedf40940fe8d GIT binary patch literal 457 zcmX@f$iVPmDI_CEu|cMp&M zG7Jn1EFiyu43L+X=jG*n`0(M{wQIk7c*uj~6qu2W`VVpegHK{*YLS8=ercl^1_lOJ z1&HSVOc0s@9F`SxruKVsF&J<#7e4xbKPG!=iRF}I-fn_Ip6h}nH^^vg3rbH<(kalD zxODDgBLBa?_V2>yDd&G{Tyr?Acm~^(6vh+!V6zz+SQuCt5N2~QurXB3Nlr*jWnc_5 QaJmq2v>}U;^&NvP01S&rIsgCw literal 0 HcmV?d00001 diff --git a/proj/block/template/device_side.ase b/proj/block/template/device_side.ase new file mode 100644 index 0000000000000000000000000000000000000000..f74ff33d4e392c5f7d363d952aaab9ff979e9a6a GIT binary patch literal 370 zcmXS7WMFu(l#xMzL4bjSfsuiMA%y`Mure@$1Q|FOIFN;@#{R^>!0_uME7(?61_lN( z1_lOp1+bM!c33blFi0wZKXj0|SE? z0|NuQ0@z91FNv0AgD#{LjFU!I1l(fngPxd@T%8|J%>+KLf*U z1B3qz409M5{xdMF4pREhz)-8j{hxuMKtSL>1H)+_kof-wuKx@S{}0Q9$j=~`{C~Xc zKLf+-ogM!f7z9K>B1)Pr{}~vJY-0a2FnENN{%2sAwru}@28PRbUj8p;U|?VY#RSN^ z5MObzt1zg@GT3M`gqksQJF=bfs(%x7=yxB(tN*Nh9~dkaW-#QgV#s|h?DgBv@3w)# z9I)$ZwYUoe1VD~z-~u`4v&#R+%UjkX)`Tsp<_OVvcByP>;AoeqVJpknWw+~XJ>e$rur5D D8^f;p literal 0 HcmV?d00001 diff --git a/proj/device/cable.ase b/proj/device/cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..cc1b51e3ee0d9cfa19c92d0dd4653a9d269b102d GIT binary patch literal 656 zcmbQh#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CPehUT$21x~0s4UAw zLt%Y8JG=i347|L&{}~t(6BGY4FzgWF`7g=9z`z1B3#8W0&W@LtH!(4BhX~JPRwj8p oJq88_Rt1PD|Ct~(NIeTf#hm1nw6v78q$IXPHw9@1MkfYU0A&msfdBvi diff --git a/proj/item/black_patch_cable.ase b/proj/item/black_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..7e2a7f9646b39a64c27cdbcc0577c3ffe5d9f4ae GIT binary patch literal 673 zcmZ3;#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cl$VICk#iAV&F&(7^N3K1_$~>vosCzTb$K!$ m>P18du4cFN>$uu1_x;D8E^mGx*{UcP_6=Kj7;1l|T?YVr5U|An literal 0 HcmV?d00001 diff --git a/proj/item/blue_patch_cable.ase b/proj/item/blue_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..0eb53dad2b97380dcf4d51d5be90df930eca38c7 GIT binary patch literal 671 zcmbQw#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CR?B8P2JI@?92Fcbr&&5M6of1Y^Xj60BW4DqW}N^ literal 0 HcmV?d00001 diff --git a/proj/item/brown_patch_cable.ase b/proj/item/brown_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..87d0fcb451df45fd59b5815abb124e39622702e9 GIT binary patch literal 673 zcmZ3;#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(C+)ni m)QgA^T+MFj*KxI3?)#5FUEcgYvQ<$o>>IZ5FbIa0WdHz`z^~8% literal 0 HcmV?d00001 diff --git a/proj/item/cyan_patch_cable.ase b/proj/item/cyan_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..d4ccf71ab57d5f119b2259976f11c7de681489e2 GIT binary patch literal 672 zcmZ3$#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CXs-Rm0L$2BH6x7y%?Lvw;8r literal 0 HcmV?d00001 diff --git a/proj/item/gray_patch_cable.ase b/proj/item/gray_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..9a9c865cfe92e79fd033ace52a229c77dab7fb99 GIT binary patch literal 683 zcmZ3@#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CeW*|o0F?x>6#xJL literal 0 HcmV?d00001 diff --git a/proj/item/light_blue_patch_cable.ase b/proj/item/light_blue_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..504eb582630e9e6f52e3d091bcd0d02bd784ef8f GIT binary patch literal 672 zcmZ3$#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CPM4cuwPi~OUqYrNgRw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CA%6O2wR0)C)B1b*nQ#XhMSHa{D%M3!}+%vsHCu; p;a{?YTP*CzE5|w9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cv19WMbeEYY(f0n43@O+ lPDpfJBlpBYF^s?J&g0M8dbS3oFERyX4_q>0@OjV@2LJ)1v9JID literal 0 HcmV?d00001 diff --git a/proj/item/magenta_patch_cable.ase b/proj/item/magenta_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..fe3ead308e827474fcb5e09559d8ecc8721814a2 GIT binary patch literal 673 zcmZ3;#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Ch{iC=2xA)-hIJQ)7Zm&Q8rm7Uf{s}=Fssw!3$O-K2Qk=eE_l2VyPVz31%SrU$ mE52g1AhW&z literal 0 HcmV?d00001 diff --git a/proj/item/orange_patch_cable.ase b/proj/item/orange_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..49f1c8e16931e648eb8416d73b83fbbf20d0ee52 GIT binary patch literal 673 zcmZ3;#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CX*y7Tz6ww|p)>5EK3*#no17{sC{I|Bf4n6PC4 literal 0 HcmV?d00001 diff --git a/proj/item/pink_patch_cable.ase b/proj/item/pink_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..44ea3769168b1e51d3ca2e4f6bb5bb4a0b73fc2d GIT binary patch literal 670 zcmbQo#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cl$VICk#iAV&F*sB@Q7fE_$~>vosCzTb$K!$ m>P18du4cFN>$uu1_x;D8E^mGx*{UcP_6=Kj80rsKO9B8+FRyF> literal 0 HcmV?d00001 diff --git a/proj/item/red_patch_cable.ase b/proj/item/red_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..188923a9d2361186101fdaa67eb573fcd1c7da07 GIT binary patch literal 673 zcmZ3;#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(CAag<=?g)t$$mwe@TbN?&9O${x66#31I``33;RoU#Z2 literal 0 HcmV?d00001 diff --git a/proj/item/white_patch_cable.ase b/proj/item/white_patch_cable.ase new file mode 100644 index 0000000000000000000000000000000000000000..af535125da6a98888f9b9ebede22c4ade4ffa53d GIT binary patch literal 677 zcmZ3=#K7=iDIw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(Cw9y2Sp=Kbm+wngG z1KTOD{|pTEZ-V|aFdX{b2NHh;(#zWS0mQag_@99xgCX}n1H&pX`C1sH{lvu{vVbHk)J^>`Tuy? ze+GuvJ3Ia}FbIf%M3gjL{xdKb*~I>5VDJbj{m;NKZQ1_+3=Eg=y!>Cxz`(!)iV2W+ zA->{bS7A_*Ww6m?2sLBqc4Rx{RsSaF(C*KQMKU&?-IG3L=WL| l$HQF_wkHam*2sO?ar}9BOjW|G3zwCw8kVLqaBQ7l4*>2NvQPj3 literal 0 HcmV?d00001 diff --git a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 index 23be6be..aa8a6dc 100644 --- a/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 +++ b/src/main/generated/.cache/f3798f81c7b6fecad2cbfec741314f8a66c0eca3 @@ -1,4 +1,26 @@ -// 1.19.2 2022-11-20T23:04:16.520652716 Models -e3c6aacd49a6395f37047d3df31f91a18a411267 assets/dawd3/models/item/speaker.json +// 1.19.2 2022-11-27T14:23:10.976127707 Models +0812a674d14cfc6fbb7c0e2ac1b473bf2afe1965 assets/dawd3/models/item/brown_patch_cable.json +bf0e322e33123cb6873c2da4e8c6ab85688deb4e assets/dawd3/models/item/gray_patch_cable.json +6a9fb209d82556f5941422a8d047a0ae2af1dc8f assets/dawd3/models/item/sine_oscillator.json +215b221d48639e96de11914625a770a389d65b81 assets/dawd3/models/item/green_patch_cable.json +e34001d3c974aecfa347d435beb6bc0b9d325897 assets/dawd3/models/item/cyan_patch_cable.json +8ba890b28c5ac57c59f19ccc8c72825caac10677 assets/dawd3/models/item/magenta_patch_cable.json f7b47538f17992177e97e06842c0039ae5096b2b assets/dawd3/blockstates/speaker.json -bd0adfc8b3dc271042dd4b19a8cace4e0fffedfe assets/dawd3/models/block/speaker.json +9cf2cff42345ec60a944d7399b5047323aa8e88c assets/dawd3/models/item/red_patch_cable.json +8c6f0307320980a66c70622b0b7c72c8cfe78dc3 assets/dawd3/models/item/light_gray_patch_cable.json +5ed33e9ec3c70e8cc027eea6425951d51487437f assets/dawd3/models/item/blue_patch_cable.json +83866bdfd40b759257070558c9ccb942e082914a assets/dawd3/blockstates/fader.json +a4e8bc89d39021eb8d56ad7735216cb851d67287 assets/dawd3/models/item/light_blue_patch_cable.json +0023521ecb90e79515f0fa0088609c70aac9a605 assets/dawd3/models/block/speaker.json +8aa966337109315240614d5257eb72f959eba5d8 assets/dawd3/models/item/orange_patch_cable.json +12c4bfd825b2476955afcd3bb23c1f736ce68caa assets/dawd3/models/item/yellow_patch_cable.json +aab1bce7ec4e7c7dccd3d33d4242de12b63a981d assets/dawd3/models/item/white_patch_cable.json +6cdda36e539e23acf3db70d761338e88932a6ebb assets/dawd3/models/item/purple_patch_cable.json +e3c6aacd49a6395f37047d3df31f91a18a411267 assets/dawd3/models/item/speaker.json +32bb0e6e3bf75b9005602e8fb1042ad5d41286ad assets/dawd3/models/item/lime_patch_cable.json +956d8f117df95cf62c8cac375cff853df96840d6 assets/dawd3/models/item/pink_patch_cable.json +71fd99012b4338600f0a11dcadb9a97a6e0a15e5 assets/dawd3/models/block/fader.json +3b1811bab3ba394ba03b67ac2efc72cb35316dc8 assets/dawd3/blockstates/sine_oscillator.json +9c18a8292a0c9990cd23bebf5c6191c2114ccc6d assets/dawd3/models/item/black_patch_cable.json +d300f52d5aa2dcb2ec7d9a0cdb1138104e016d83 assets/dawd3/models/item/fader.json +0d759623578e206f437f2d9976443a773721a9f3 assets/dawd3/models/block/sine_oscillator.json diff --git a/src/main/generated/assets/dawd3/blockstates/fader.json b/src/main/generated/assets/dawd3/blockstates/fader.json new file mode 100644 index 0000000..928a49d --- /dev/null +++ b/src/main/generated/assets/dawd3/blockstates/fader.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "dawd3:block/fader", + "y": 90 + }, + "facing=north": { + "model": "dawd3:block/fader" + }, + "facing=south": { + "model": "dawd3:block/fader", + "y": 180 + }, + "facing=west": { + "model": "dawd3:block/fader", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/blockstates/sine_oscillator.json b/src/main/generated/assets/dawd3/blockstates/sine_oscillator.json new file mode 100644 index 0000000..d8f37a9 --- /dev/null +++ b/src/main/generated/assets/dawd3/blockstates/sine_oscillator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "dawd3:block/sine_oscillator", + "y": 90 + }, + "facing=north": { + "model": "dawd3:block/sine_oscillator" + }, + "facing=south": { + "model": "dawd3:block/sine_oscillator", + "y": 180 + }, + "facing=west": { + "model": "dawd3:block/sine_oscillator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/block/fader.json b/src/main/generated/assets/dawd3/models/block/fader.json new file mode 100644 index 0000000..659d3c7 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/block/fader.json @@ -0,0 +1,77 @@ +{ + "parent": "block/block", + "elements": [ + { + "faces": { + "down": { + "cullface": "down", + "texture": "#bottom" + }, + "east": { + "cullface": "east", + "texture": "#right" + }, + "north": { + "cullface": "north", + "texture": "#front" + }, + "south": { + "cullface": "south", + "texture": "#back" + }, + "up": { + "cullface": "up", + "texture": "#top" + }, + "west": { + "cullface": "west", + "texture": "#left" + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 8.0, + 16.0 + ] + }, + { + "faces": { + "north": { + "cullface": "north", + "texture": "#port", + "uv": [ + 4.0, + 0.0, + 8.0, + 4.0 + ] + } + }, + "from": [ + 6.0, + 3.0, + -0.01 + ], + "to": [ + 10.0, + 7.0, + 0.01 + ] + } + ], + "textures": { + "back": "dawd3:block/fader_side", + "bottom": "dawd3:block/fader_bottom", + "front": "dawd3:block/fader_side", + "left": "dawd3:block/fader_side", + "particle": "dawd3:block/fader_side", + "port": "dawd3:device/port", + "right": "dawd3:block/fader_side", + "top": "dawd3:block/fader_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/block/sine_oscillator.json b/src/main/generated/assets/dawd3/models/block/sine_oscillator.json new file mode 100644 index 0000000..efca19e --- /dev/null +++ b/src/main/generated/assets/dawd3/models/block/sine_oscillator.json @@ -0,0 +1,101 @@ +{ + "parent": "block/block", + "elements": [ + { + "faces": { + "down": { + "cullface": "down", + "texture": "#bottom" + }, + "east": { + "cullface": "east", + "texture": "#right" + }, + "north": { + "cullface": "north", + "texture": "#front" + }, + "south": { + "cullface": "south", + "texture": "#back" + }, + "up": { + "cullface": "up", + "texture": "#top" + }, + "west": { + "cullface": "west", + "texture": "#left" + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "north": { + "cullface": "north", + "texture": "#port", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + } + }, + "from": [ + 9.0, + 6.0, + -0.01 + ], + "to": [ + 13.0, + 10.0, + 0.01 + ] + }, + { + "faces": { + "north": { + "cullface": "north", + "texture": "#port", + "uv": [ + 4.0, + 0.0, + 8.0, + 4.0 + ] + } + }, + "from": [ + 3.0, + 6.0, + -0.01 + ], + "to": [ + 7.0, + 10.0, + 0.01 + ] + } + ], + "textures": { + "back": "dawd3:block/sine_oscillator_side", + "bottom": "dawd3:block/sine_oscillator_side", + "front": "dawd3:block/sine_oscillator_front", + "left": "dawd3:block/sine_oscillator_side", + "particle": "dawd3:block/sine_oscillator_side", + "port": "dawd3:device/port", + "right": "dawd3:block/sine_oscillator_side", + "top": "dawd3:block/sine_oscillator_side" + } +} \ 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 index a240d95..c4d837d 100644 --- a/src/main/generated/assets/dawd3/models/block/speaker.json +++ b/src/main/generated/assets/dawd3/models/block/speaker.json @@ -5,11 +5,11 @@ "faces": { "down": { "cullface": "down", - "texture": "#side" + "texture": "#bottom" }, "east": { "cullface": "east", - "texture": "#side" + "texture": "#right" }, "north": { "cullface": "north", @@ -17,15 +17,15 @@ }, "south": { "cullface": "south", - "texture": "#side" + "texture": "#back" }, "up": { "cullface": "up", - "texture": "#side" + "texture": "#top" }, "west": { "cullface": "west", - "texture": "#side" + "texture": "#left" } }, "from": [ @@ -53,21 +53,25 @@ } }, "from": [ - 6.5, - 6.5, + 6.0, + 3.0, 15.99 ], "to": [ - 9.5, - 9.5, + 10.0, + 7.0, 16.01 ] } ], "textures": { + "back": "dawd3:block/speaker_side", + "bottom": "dawd3:block/speaker_side", "front": "dawd3:block/speaker_front", - "particle": "#side", + "left": "dawd3:block/speaker_side", + "particle": "dawd3:block/speaker_side", "port": "dawd3:device/port", - "side": "dawd3:block/speaker_side" + "right": "dawd3:block/speaker_side", + "top": "dawd3:block/speaker_side" } } \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/black_patch_cable.json b/src/main/generated/assets/dawd3/models/item/black_patch_cable.json new file mode 100644 index 0000000..8fcc047 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/black_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/black_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/blue_patch_cable.json b/src/main/generated/assets/dawd3/models/item/blue_patch_cable.json new file mode 100644 index 0000000..7d18143 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/blue_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/blue_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/brown_patch_cable.json b/src/main/generated/assets/dawd3/models/item/brown_patch_cable.json new file mode 100644 index 0000000..48d99f5 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/brown_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/brown_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/cyan_patch_cable.json b/src/main/generated/assets/dawd3/models/item/cyan_patch_cable.json new file mode 100644 index 0000000..512354c --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/cyan_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/cyan_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/fader.json b/src/main/generated/assets/dawd3/models/item/fader.json new file mode 100644 index 0000000..858d25a --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/fader.json @@ -0,0 +1,3 @@ +{ + "parent": "dawd3:block/fader" +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/gray_patch_cable.json b/src/main/generated/assets/dawd3/models/item/gray_patch_cable.json new file mode 100644 index 0000000..58f65a2 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/gray_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/gray_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/green_patch_cable.json b/src/main/generated/assets/dawd3/models/item/green_patch_cable.json new file mode 100644 index 0000000..12574b1 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/green_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/green_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/light_blue_patch_cable.json b/src/main/generated/assets/dawd3/models/item/light_blue_patch_cable.json new file mode 100644 index 0000000..7f87fee --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/light_blue_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/light_blue_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/light_gray_patch_cable.json b/src/main/generated/assets/dawd3/models/item/light_gray_patch_cable.json new file mode 100644 index 0000000..a2575eb --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/light_gray_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/light_gray_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/lime_patch_cable.json b/src/main/generated/assets/dawd3/models/item/lime_patch_cable.json new file mode 100644 index 0000000..c71e1cb --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/lime_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/lime_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/magenta_patch_cable.json b/src/main/generated/assets/dawd3/models/item/magenta_patch_cable.json new file mode 100644 index 0000000..42092ad --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/magenta_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/magenta_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/orange_patch_cable.json b/src/main/generated/assets/dawd3/models/item/orange_patch_cable.json new file mode 100644 index 0000000..93139ca --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/orange_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/orange_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/pink_patch_cable.json b/src/main/generated/assets/dawd3/models/item/pink_patch_cable.json new file mode 100644 index 0000000..16eb1ac --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/pink_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/pink_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/purple_patch_cable.json b/src/main/generated/assets/dawd3/models/item/purple_patch_cable.json new file mode 100644 index 0000000..d6a7205 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/purple_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/purple_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/red_patch_cable.json b/src/main/generated/assets/dawd3/models/item/red_patch_cable.json new file mode 100644 index 0000000..f439905 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/red_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/red_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/sine_oscillator.json b/src/main/generated/assets/dawd3/models/item/sine_oscillator.json new file mode 100644 index 0000000..10806cd --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/sine_oscillator.json @@ -0,0 +1,3 @@ +{ + "parent": "dawd3:block/sine_oscillator" +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/white_patch_cable.json b/src/main/generated/assets/dawd3/models/item/white_patch_cable.json new file mode 100644 index 0000000..4715cc4 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/white_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/white_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/dawd3/models/item/yellow_patch_cable.json b/src/main/generated/assets/dawd3/models/item/yellow_patch_cable.json new file mode 100644 index 0000000..40b13f9 --- /dev/null +++ b/src/main/generated/assets/dawd3/models/item/yellow_patch_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "dawd3:item/yellow_patch_cable" + } +} \ No newline at end of file diff --git a/src/main/kotlin/net/liquidev/dawd3/Mod.kt b/src/main/kotlin/net/liquidev/dawd3/Mod.kt index f8763e2..f0c908a 100644 --- a/src/main/kotlin/net/liquidev/dawd3/Mod.kt +++ b/src/main/kotlin/net/liquidev/dawd3/Mod.kt @@ -6,8 +6,9 @@ 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.block.entity.registerClientBlockEntityEvents import net.liquidev.dawd3.item.Items +import net.liquidev.dawd3.net.Packets import org.slf4j.Logger import org.slf4j.LoggerFactory @@ -34,7 +35,9 @@ object Mod : ModInitializer, ClientModInitializer { D3r.unload() } - registerBlockEntityEvents() + registerClientBlockEntityEvents() + Blocks.initializeClient() + Packets.registerClientReceivers() } private fun loggerName(name: String?): String = diff --git a/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt b/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt index 89d52ab..51a5ec2 100644 --- a/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt +++ b/src/main/kotlin/net/liquidev/dawd3/audio/Audio.kt @@ -2,12 +2,12 @@ package net.liquidev.dawd3.audio import net.liquidev.d3r.D3r import net.liquidev.dawd3.Mod +import net.liquidev.dawd3.audio.generator.GeneratorWithProcessingState 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