Skip to content

Commit 0139430

Browse files
Mooo0042Mooo0042
committed
Multiple chnges that should fix some issues
1 parent 9081462 commit 0139430

File tree

61 files changed

+103
-882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+103
-882
lines changed

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111

1212
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
1313

14-
modApi "org.modsauce:otyacraftenginerenewed:${rootProject.oe_version}"
14+
modApi files("../../OtyacraftEngineRenewed/common/build/libs/otyacraftenginerenewed-3.7.1-1.21.1-alpha1.jar")
1515
modApi "me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}"
1616

1717
implementation "dev.felnull:felnull-java-library:${rootProject.felnull_version}"

‎common/src/main/java/org/modsauce/impr/blockentity/IMPBlockEntities.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import dev.architectury.registry.registries.DeferredRegister;
44
import dev.architectury.registry.registries.RegistrySupplier;
55
import org.modsauce.impr.block.IMPBlocks;
6-
import org.modsauce.otyacraftenginerenewed.OtyacraftEngine;
6+
import org.modsauce.impr.IamMusicPlayer;
77
import net.minecraft.core.registries.Registries;
88
import net.minecraft.world.level.block.Block;
99
import net.minecraft.world.level.block.entity.BlockEntity;
1010
import net.minecraft.world.level.block.entity.BlockEntityType;
1111

1212
public class IMPBlockEntities {
13-
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES_REGISTER = DeferredRegister.create(OtyacraftEngine.MODID, Registries.BLOCK_ENTITY_TYPE);
13+
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES_REGISTER = DeferredRegister.create(IamMusicPlayer.MODID, Registries.BLOCK_ENTITY_TYPE);
1414
public static final RegistrySupplier<BlockEntityType<MusicManagerBlockEntity>> MUSIC_MANAGER = register("music_manager", MusicManagerBlockEntity::new, IMPBlocks.MUSIC_MANAGER);
1515
public static final RegistrySupplier<BlockEntityType<CassetteDeckBlockEntity>> CASSETTE_DECK = register("cassette_deck", CassetteDeckBlockEntity::new, IMPBlocks.CASSETTE_DECK);
1616
public static final RegistrySupplier<BlockEntityType<BoomboxBlockEntity>> BOOMBOX = register("boombox", BoomboxBlockEntity::new, IMPBlocks.BOOMBOX);

‎common/src/main/java/org/modsauce/impr/networking/IMPPackets.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.modsauce.impr.networking;
22

33
import dev.architectury.networking.NetworkManager;
4+
import dev.architectury.platform.Platform;
45
import org.modsauce.impr.IamMusicPlayer;
56
import org.modsauce.impr.client.handler.ClientMessageHandler;
67
import org.modsauce.impr.music.resource.*;
@@ -51,9 +52,11 @@ public static void init() {
5152
}
5253

5354
public static void clientInit() {
54-
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_SYNC, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicSyncResponseMessage(new MusicSyncResponseMessage(friendlyByteBuf), packetContext));
55-
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_RING_READY, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicRingReadyResponseMessage(new MusicReadyMessage(friendlyByteBuf), packetContext));
56-
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_RING_STATE, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicRingStateResponseMessage(new MusicRingStateMessage(friendlyByteBuf), packetContext));
55+
// S2C Packets - Only register on client side to avoid Fabric networking issues
56+
// The server doesn't need to register S2C receivers, only the client does
57+
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_SYNC, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicSyncResponseMessage(new MusicSyncResponseMessage((RegistryFriendlyByteBuf) friendlyByteBuf), packetContext));
58+
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_RING_READY, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicRingReadyResponseMessage(new MusicReadyMessage((RegistryFriendlyByteBuf) friendlyByteBuf), packetContext));
59+
NetworkManager.registerReceiver(NetworkManager.s2c(), MUSIC_RING_STATE, (friendlyByteBuf, packetContext) -> ClientMessageHandler.onMusicRingStateResponseMessage(new MusicRingStateMessage((RegistryFriendlyByteBuf) friendlyByteBuf), packetContext));
5760
}
5861

5962
public static class LidCycleMessage implements PacketMessage {

‎common/src/main/resources/assets/iammusicplayer_renewed/blockstates/boombox.json‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,63 @@
11
{
22
"variants": {
3-
"facing=east,power=true": {
4-
"model": "iammusicplayer:block/boombox/boombox_on",
3+
"facing=east,power=true,raise=true": {
4+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
55
"y": 90
66
},
7-
"facing=north,power=true": {
8-
"model": "iammusicplayer:block/boombox/boombox_on"
7+
"facing=north,power=true,raise=true": {
8+
"model": "iammusicplayer_renewed:block/boombox/boombox_on"
99
},
10-
"facing=south,power=true": {
11-
"model": "iammusicplayer:block/boombox/boombox_on",
10+
"facing=south,power=true,raise=true": {
11+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
1212
"y": 180
1313
},
14-
"facing=west,power=true": {
15-
"model": "iammusicplayer:block/boombox/boombox_on",
14+
"facing=west,power=true,raise=true": {
15+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
1616
"y": 270
1717
},
18-
"facing=east,power=false": {
19-
"model": "iammusicplayer:block/boombox/boombox_off",
18+
"facing=east,power=false,raise=true": {
19+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
2020
"y": 90
2121
},
22-
"facing=north,power=false": {
23-
"model": "iammusicplayer:block/boombox/boombox_off"
22+
"facing=north,power=false,raise=true": {
23+
"model": "iammusicplayer_renewed:block/boombox/boombox_off"
2424
},
25-
"facing=south,power=false": {
26-
"model": "iammusicplayer:block/boombox/boombox_off",
25+
"facing=south,power=false,raise=true": {
26+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
2727
"y": 180
2828
},
29-
"facing=west,power=false": {
30-
"model": "iammusicplayer:block/boombox/boombox_off",
29+
"facing=west,power=false,raise=true": {
30+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
31+
"y": 270
32+
},
33+
"facing=east,power=true,raise=false": {
34+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
35+
"y": 90
36+
},
37+
"facing=north,power=true,raise=false": {
38+
"model": "iammusicplayer_renewed:block/boombox/boombox_on"
39+
},
40+
"facing=south,power=true,raise=false": {
41+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
42+
"y": 180
43+
},
44+
"facing=west,power=true,raise=false": {
45+
"model": "iammusicplayer_renewed:block/boombox/boombox_on",
46+
"y": 270
47+
},
48+
"facing=east,power=false,raise=false": {
49+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
50+
"y": 90
51+
},
52+
"facing=north,power=false,raise=false": {
53+
"model": "iammusicplayer_renewed:block/boombox/boombox_off"
54+
},
55+
"facing=south,power=false,raise=false": {
56+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
57+
"y": 180
58+
},
59+
"facing=west,power=false,raise=false": {
60+
"model": "iammusicplayer_renewed:block/boombox/boombox_off",
3161
"y": 270
3262
}
3363
}

‎common/src/main/resources/assets/iammusicplayer_renewed/blockstates/cassette_deck.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"variants": {
33
"facing=east,power=true": {
4-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_on",
4+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_on",
55
"y": 90
66
},
77
"facing=north,power=true": {
8-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_on"
8+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_on"
99
},
1010
"facing=south,power=true": {
11-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_on",
11+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_on",
1212
"y": 180
1313
},
1414
"facing=west,power=true": {
15-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_on",
15+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_on",
1616
"y": 270
1717
},
1818
"facing=east,power=false": {
19-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_off",
19+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_off",
2020
"y": 90
2121
},
2222
"facing=north,power=false": {
23-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_off"
23+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_off"
2424
},
2525
"facing=south,power=false": {
26-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_off",
26+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_off",
2727
"y": 180
2828
},
2929
"facing=west,power=false": {
30-
"model": "iammusicplayer:block/cassette_deck/cassette_deck_off",
30+
"model": "iammusicplayer_renewed:block/cassette_deck/cassette_deck_off",
3131
"y": 270
3232
}
3333
}

‎common/src/main/resources/assets/iammusicplayer_renewed/blockstates/music_manager.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"variants": {
33
"facing=east,power=true": {
4-
"model": "iammusicplayer:block/music_manager/music_manager_on",
4+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_on",
55
"y": 90
66
},
77
"facing=north,power=true": {
8-
"model": "iammusicplayer:block/music_manager/music_manager_on"
8+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_on"
99
},
1010
"facing=south,power=true": {
11-
"model": "iammusicplayer:block/music_manager/music_manager_on",
11+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_on",
1212
"y": 180
1313
},
1414
"facing=west,power=true": {
15-
"model": "iammusicplayer:block/music_manager/music_manager_on",
15+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_on",
1616
"y": 270
1717
},
1818
"facing=east,power=false": {
19-
"model": "iammusicplayer:block/music_manager/music_manager_off",
19+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_off",
2020
"y": 90
2121
},
2222
"facing=north,power=false": {
23-
"model": "iammusicplayer:block/music_manager/music_manager_off"
23+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_off"
2424
},
2525
"facing=south,power=false": {
26-
"model": "iammusicplayer:block/music_manager/music_manager_off",
26+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_off",
2727
"y": 180
2828
},
2929
"facing=west,power=false": {
30-
"model": "iammusicplayer:block/music_manager/music_manager_off",
30+
"model": "iammusicplayer_renewed:block/music_manager/music_manager_off",
3131
"y": 270
3232
}
3333
}

‎common/src/main/resources/assets/iammusicplayer_renewed/models/block/boombox/boombox_base.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"credit": "Made with Blockbench",
33
"textures": {
4-
"0": "iammusicplayer:block/boombox/boombox",
5-
"particle": "iammusicplayer:block/boombox/boombox"
4+
"0": "iammusicplayer_renewed:block/boombox/boombox",
5+
"particle": "iammusicplayer_renewed:block/boombox/boombox"
66
},
77
"elements": [
88
{

‎common/src/main/resources/assets/iammusicplayer_renewed/models/block/boombox/boombox_handle.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"credit": "Made with Blockbench",
33
"textures": {
4-
"0": "iammusicplayer:block/boombox/boombox",
5-
"particle": "iammusicplayer:block/boombox/boombox"
4+
"0": "iammusicplayer_renewed:block/boombox/boombox",
5+
"particle": "iammusicplayer_renewed:block/boombox/boombox"
66
},
77
"elements": [
88
{

‎common/src/main/resources/assets/iammusicplayer_renewed/models/block/boombox/boombox_off.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"parent": "iammusicplayer:block/boombox/boombox_base",
2+
"parent": "iammusicplayer_renewed:block/boombox/boombox_base",
33
"textures": {
4-
"1": "iammusicplayer:block/boombox/boombox_off"
4+
"1": "iammusicplayer_renewed:block/boombox/boombox_off"
55
}
66
}

‎common/src/main/resources/assets/iammusicplayer_renewed/models/block/boombox/boombox_on.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"parent": "iammusicplayer:block/boombox/boombox_base",
2+
"parent": "iammusicplayer_renewed:block/boombox/boombox_base",
33
"textures": {
4-
"1": "iammusicplayer:block/boombox/boombox_on"
4+
"1": "iammusicplayer_renewed:block/boombox/boombox_on"
55
}
66
}

0 commit comments

Comments
 (0)