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 0000000..3812a06 Binary files /dev/null and b/proj/block/fader_bottom.ase differ diff --git a/proj/block/fader_handle.ase b/proj/block/fader_handle.ase new file mode 100644 index 0000000..b125df9 Binary files /dev/null and b/proj/block/fader_handle.ase differ diff --git a/proj/block/fader_side.ase b/proj/block/fader_side.ase new file mode 100644 index 0000000..2f038d1 Binary files /dev/null and b/proj/block/fader_side.ase differ diff --git a/proj/block/fader_top.ase b/proj/block/fader_top.ase new file mode 100644 index 0000000..edb4ec3 Binary files /dev/null and b/proj/block/fader_top.ase differ diff --git a/proj/block/sine_oscillator_front.ase b/proj/block/sine_oscillator_front.ase new file mode 100644 index 0000000..2caae3a Binary files /dev/null and b/proj/block/sine_oscillator_front.ase differ diff --git a/proj/block/sine_oscillator_side.ase b/proj/block/sine_oscillator_side.ase new file mode 100644 index 0000000..7fe731b Binary files /dev/null and b/proj/block/sine_oscillator_side.ase differ diff --git a/proj/block/template/device_side.ase b/proj/block/template/device_side.ase new file mode 100644 index 0000000..f74ff33 Binary files /dev/null and b/proj/block/template/device_side.ase differ diff --git a/proj/cable_color_palette.ase b/proj/cable_color_palette.ase new file mode 100644 index 0000000..7cc0216 Binary files /dev/null and b/proj/cable_color_palette.ase differ diff --git a/proj/device/cable.ase b/proj/device/cable.ase new file mode 100644 index 0000000..cc1b51e Binary files /dev/null and b/proj/device/cable.ase differ diff --git a/proj/device/port.ase b/proj/device/port.ase index a369e1b..a3946b4 100644 Binary files a/proj/device/port.ase and b/proj/device/port.ase differ diff --git a/proj/item/black_patch_cable.ase b/proj/item/black_patch_cable.ase new file mode 100644 index 0000000..7e2a7f9 Binary files /dev/null and b/proj/item/black_patch_cable.ase differ diff --git a/proj/item/blue_patch_cable.ase b/proj/item/blue_patch_cable.ase new file mode 100644 index 0000000..0eb53da Binary files /dev/null and b/proj/item/blue_patch_cable.ase differ diff --git a/proj/item/brown_patch_cable.ase b/proj/item/brown_patch_cable.ase new file mode 100644 index 0000000..87d0fcb Binary files /dev/null and b/proj/item/brown_patch_cable.ase differ diff --git a/proj/item/cyan_patch_cable.ase b/proj/item/cyan_patch_cable.ase new file mode 100644 index 0000000..d4ccf71 Binary files /dev/null and b/proj/item/cyan_patch_cable.ase differ diff --git a/proj/item/gray_patch_cable.ase b/proj/item/gray_patch_cable.ase new file mode 100644 index 0000000..9a9c865 Binary files /dev/null and b/proj/item/gray_patch_cable.ase differ diff --git a/proj/item/green_patch_cable.ase b/proj/item/green_patch_cable.ase new file mode 100644 index 0000000..c15baaa Binary files /dev/null and b/proj/item/green_patch_cable.ase differ diff --git a/proj/item/light_blue_patch_cable.ase b/proj/item/light_blue_patch_cable.ase new file mode 100644 index 0000000..504eb58 Binary files /dev/null and b/proj/item/light_blue_patch_cable.ase differ diff --git a/proj/item/light_gray_patch_cable.ase b/proj/item/light_gray_patch_cable.ase new file mode 100644 index 0000000..3f51bf7 Binary files /dev/null and b/proj/item/light_gray_patch_cable.ase differ diff --git a/proj/item/lime_patch_cable.ase b/proj/item/lime_patch_cable.ase new file mode 100644 index 0000000..de10a2d Binary files /dev/null and b/proj/item/lime_patch_cable.ase differ diff --git a/proj/item/magenta_patch_cable.ase b/proj/item/magenta_patch_cable.ase new file mode 100644 index 0000000..fe3ead3 Binary files /dev/null and b/proj/item/magenta_patch_cable.ase differ diff --git a/proj/item/orange_patch_cable.ase b/proj/item/orange_patch_cable.ase new file mode 100644 index 0000000..49f1c8e Binary files /dev/null and b/proj/item/orange_patch_cable.ase differ diff --git a/proj/item/pink_patch_cable.ase b/proj/item/pink_patch_cable.ase new file mode 100644 index 0000000..44ea376 Binary files /dev/null and b/proj/item/pink_patch_cable.ase differ diff --git a/proj/item/purple_patch_cable.ase b/proj/item/purple_patch_cable.ase new file mode 100644 index 0000000..6ea2d93 Binary files /dev/null and b/proj/item/purple_patch_cable.ase differ diff --git a/proj/item/red_patch_cable.ase b/proj/item/red_patch_cable.ase new file mode 100644 index 0000000..188923a Binary files /dev/null and b/proj/item/red_patch_cable.ase differ diff --git a/proj/item/white_patch_cable.ase b/proj/item/white_patch_cable.ase new file mode 100644 index 0000000..af53512 Binary files /dev/null and b/proj/item/white_patch_cable.ase differ diff --git a/proj/item/yellow_patch_cable.ase b/proj/item/yellow_patch_cable.ase new file mode 100644 index 0000000..f8838d3 Binary files /dev/null and b/proj/item/yellow_patch_cable.ase differ 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