Skip to content

Commit b1cdbe7

Browse files
JackyyTVJackyyTV
committed
Fixed recipe conditions and network packets handling
1 parent 217c9ea commit b1cdbe7

File tree

145 files changed

+2287
-1497
lines changed

Some content is hidden

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

145 files changed

+2287
-1497
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'eclipse'
33
id 'idea'
4-
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
4+
id 'net.minecraftforge.gradle' version '[6.0.14,6.2)'
55
}
66

77
import net.minecraftforge.gradle.common.tasks.SignJar

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ mod_name=Exchangers
77
mc_version=1.20.2
88
mc_version_range=[1.20.2,1.21)
99

10-
forge_version=48.0.13
11-
forge_version_range=[48,)
10+
forge_version=48.0.20
11+
forge_version_range=[48.0.17,)
1212
loader_version_range=[48,)
1313

1414
mappings_channel=official

‎src/main/java/jackyy/exchangers/Exchangers.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jackyy.exchangers.handler.ClientEventsHandler;
44
import jackyy.exchangers.handler.CommonEventsHandler;
5+
import jackyy.exchangers.handler.network.NetworkHandler;
56
import jackyy.exchangers.registry.ModConfigs;
67
import jackyy.exchangers.registry.ModItems;
78
import jackyy.exchangers.registry.crafting.ModCrafting;
@@ -27,6 +28,7 @@ public Exchangers() {
2728

2829
private void commonSetup(final FMLCommonSetupEvent event) {
2930
MinecraftForge.EVENT_BUS.register(new CommonEventsHandler());
31+
NetworkHandler.registerMessages();
3032
}
3133

3234
private void clientSetup(final FMLClientSetupEvent event) {

‎src/main/java/jackyy/exchangers/handler/network/NetworkHandler.java

Lines changed: 58 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,76 +5,82 @@
55
import net.minecraft.resources.ResourceLocation;
66
import net.minecraft.server.level.ServerPlayer;
77
import net.minecraftforge.network.ChannelBuilder;
8+
import net.minecraftforge.network.NetworkDirection;
89
import net.minecraftforge.network.PacketDistributor;
910
import net.minecraftforge.network.SimpleChannel;
1011

1112
public class NetworkHandler {
12-
public static SimpleChannel CHANNEL = ChannelBuilder
13-
.named(new ResourceLocation(Reference.MODID, "main_channel"))
14-
.networkProtocolVersion(1)
15-
.simpleChannel()
13+
public static SimpleChannel channel;
1614

17-
.messageBuilder(PacketSwitchRange.class)
18-
.encoder(PacketSwitchRange::encode)
19-
.decoder(PacketSwitchRange::decode)
20-
.consumerNetworkThread(PacketSwitchRange::handle)
21-
.add()
15+
public static void registerMessages() {
16+
channel = ChannelBuilder
17+
.named(new ResourceLocation(Reference.MODID, "main_channel"))
18+
.networkProtocolVersion(1)
19+
.acceptedVersions((s, v) -> v == 1)
20+
.simpleChannel();
2221

23-
.messageBuilder(PacketIncreaseRange.class)
24-
.encoder(PacketIncreaseRange::encode)
25-
.decoder(PacketIncreaseRange::decode)
26-
.consumerNetworkThread(PacketIncreaseRange::handle)
27-
.add()
22+
channel.messageBuilder(PacketSwitchRange.class, NetworkDirection.PLAY_TO_SERVER)
23+
.encoder(PacketSwitchRange::encode)
24+
.decoder(PacketSwitchRange::decode)
25+
.consumerNetworkThread(PacketSwitchRange::handle)
26+
.add();
2827

29-
.messageBuilder(PacketDecreaseRange.class)
30-
.encoder(PacketDecreaseRange::encode)
31-
.decoder(PacketDecreaseRange::decode)
32-
.consumerNetworkThread(PacketDecreaseRange::handle)
33-
.add()
28+
channel.messageBuilder(PacketIncreaseRange.class, NetworkDirection.PLAY_TO_SERVER)
29+
.encoder(PacketIncreaseRange::encode)
30+
.decoder(PacketIncreaseRange::decode)
31+
.consumerNetworkThread(PacketIncreaseRange::handle)
32+
.add();
3433

35-
.messageBuilder(PacketSwitchMode.class)
36-
.encoder(PacketSwitchMode::encode)
37-
.decoder(PacketSwitchMode::decode)
38-
.consumerNetworkThread(PacketSwitchMode::handle)
39-
.add()
34+
channel.messageBuilder(PacketDecreaseRange.class, NetworkDirection.PLAY_TO_SERVER)
35+
.encoder(PacketDecreaseRange::encode)
36+
.decoder(PacketDecreaseRange::decode)
37+
.consumerNetworkThread(PacketDecreaseRange::handle)
38+
.add();
4039

41-
.messageBuilder(PacketToggleForceDropItems.class)
42-
.encoder(PacketToggleForceDropItems::encode)
43-
.decoder(PacketToggleForceDropItems::decode)
44-
.consumerNetworkThread(PacketToggleForceDropItems::handle)
45-
.add()
40+
channel.messageBuilder(PacketSwitchMode.class, NetworkDirection.PLAY_TO_SERVER)
41+
.encoder(PacketSwitchMode::encode)
42+
.decoder(PacketSwitchMode::decode)
43+
.consumerNetworkThread(PacketSwitchMode::handle)
44+
.add();
4645

47-
.messageBuilder(PacketToggleDirectionalPlacement.class)
48-
.encoder(PacketToggleDirectionalPlacement::encode)
49-
.decoder(PacketToggleDirectionalPlacement::decode)
50-
.consumerNetworkThread(PacketToggleDirectionalPlacement::handle)
51-
.add()
46+
channel.messageBuilder(PacketToggleForceDropItems.class, NetworkDirection.PLAY_TO_SERVER)
47+
.encoder(PacketToggleForceDropItems::encode)
48+
.decoder(PacketToggleForceDropItems::decode)
49+
.consumerNetworkThread(PacketToggleForceDropItems::handle)
50+
.add();
5251

53-
.messageBuilder(PacketToggleFuzzyPlacement.class)
54-
.encoder(PacketToggleFuzzyPlacement::encode)
55-
.decoder(PacketToggleFuzzyPlacement::decode)
56-
.consumerNetworkThread(PacketToggleFuzzyPlacement::handle)
57-
.add()
52+
channel.messageBuilder(PacketToggleDirectionalPlacement.class, NetworkDirection.PLAY_TO_SERVER)
53+
.encoder(PacketToggleDirectionalPlacement::encode)
54+
.decoder(PacketToggleDirectionalPlacement::decode)
55+
.consumerNetworkThread(PacketToggleDirectionalPlacement::handle)
56+
.add();
5857

59-
.messageBuilder(PacketSetFuzzyPlacementChance.class)
60-
.encoder(PacketSetFuzzyPlacementChance::encode)
61-
.decoder(PacketSetFuzzyPlacementChance::decode)
62-
.consumerNetworkThread(PacketSetFuzzyPlacementChance::handle)
63-
.add()
58+
channel.messageBuilder(PacketToggleFuzzyPlacement.class, NetworkDirection.PLAY_TO_SERVER)
59+
.encoder(PacketToggleFuzzyPlacement::encode)
60+
.decoder(PacketToggleFuzzyPlacement::decode)
61+
.consumerNetworkThread(PacketToggleFuzzyPlacement::handle)
62+
.add();
6463

65-
.messageBuilder(PacketToggleVoidItems.class)
66-
.encoder(PacketToggleVoidItems::encode)
67-
.decoder(PacketToggleVoidItems::decode)
68-
.consumerNetworkThread(PacketToggleVoidItems::handle)
69-
.add();
64+
channel.messageBuilder(PacketSetFuzzyPlacementChance.class, NetworkDirection.PLAY_TO_SERVER)
65+
.encoder(PacketSetFuzzyPlacementChance::encode)
66+
.decoder(PacketSetFuzzyPlacementChance::decode)
67+
.consumerNetworkThread(PacketSetFuzzyPlacementChance::handle)
68+
.add();
69+
70+
channel.messageBuilder(PacketToggleVoidItems.class, NetworkDirection.PLAY_TO_SERVER)
71+
.encoder(PacketToggleVoidItems::encode)
72+
.decoder(PacketToggleVoidItems::decode)
73+
.consumerNetworkThread(PacketToggleVoidItems::handle)
74+
.add();
75+
}
7076

7177
public static void sendToClient(Object packet, ServerPlayer player) {
72-
if (CHANNEL.isRemotePresent(player.connection.getConnection()) && !player.connection.getConnection().isMemoryConnection())
73-
CHANNEL.send(packet, PacketDistributor.PLAYER.with(player));
78+
if (channel.isRemotePresent(player.connection.getConnection()) && !player.connection.getConnection().isMemoryConnection())
79+
channel.send(packet, PacketDistributor.PLAYER.with(player));
7480
}
7581

7682
public static void sendToServer(Object packet) {
77-
CHANNEL.send(packet, PacketDistributor.SERVER.noArg());
83+
channel.send(packet, PacketDistributor.SERVER.noArg());
7884
}
7985

8086
}

‎src/main/java/jackyy/exchangers/handler/network/packet/PacketSetFuzzyPlacementChance.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
public record PacketSetFuzzyPlacementChance(int chance) {
1111

12-
public PacketSetFuzzyPlacementChance(int chance) {
13-
this.chance = chance;
14-
}
15-
1612
public void encode(FriendlyByteBuf buffer) {
1713
buffer.writeInt(chance);
1814
}

‎src/main/resources/data/exchangers/recipes/enderio/copper_alloy_exchanger.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
}
10-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
}
14+
]
15+
},
1116
"pattern": [
1217
"IBI",
1318
"ICI",

‎src/main/resources/data/exchangers/recipes/enderio/easy/conductive_exchanger.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
},
10-
{
11-
"type": "exchangers:ender_io_recipes_type", "value": "easy"
12-
}
13-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
},
14+
{
15+
"type": "exchangers:ender_io_recipes_type",
16+
"value": "easy"
17+
}
18+
]
19+
},
1420
"pattern": [
1521
"IGI",
1622
"ICI",

‎src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
},
10-
{
11-
"type": "exchangers:ender_io_recipes_type", "value": "easy"
12-
}
13-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
},
14+
{
15+
"type": "exchangers:ender_io_recipes_type",
16+
"value": "easy"
17+
}
18+
]
19+
},
1420
"pattern": [
1521
"DVD",
1622
"DCD",

‎src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
},
10-
{
11-
"type": "exchangers:ender_io_recipes_type", "value": "easy"
12-
}
13-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
},
14+
{
15+
"type": "exchangers:ender_io_recipes_type",
16+
"value": "easy"
17+
}
18+
]
19+
},
1420
"pattern": [
1521
"PEP",
1622
"EDE",

‎src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
},
10-
{
11-
"type": "exchangers:ender_io_recipes_type", "value": "easy"
12-
}
13-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
},
14+
{
15+
"type": "exchangers:ender_io_recipes_type",
16+
"value": "easy"
17+
}
18+
]
19+
},
1420
"pattern": [
1521
"PSP",
1622
"SVS",

‎src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
{
22
"type": "crafting_shaped",
3-
"conditions": [
4-
{
5-
"type": "exchangers:ender_io_module", "enabled": true
6-
},
7-
{
8-
"type": "forge:mod_loaded", "modid": "enderio"
9-
},
10-
{
11-
"type": "exchangers:ender_io_recipes_type", "value": "easy"
12-
}
13-
],
3+
"forge:condition": {
4+
"type": "forge:and",
5+
"values": [
6+
{
7+
"type": "exchangers:ender_io_module",
8+
"enabled": true
9+
},
10+
{
11+
"type": "forge:mod_loaded",
12+
"modid": "enderio"
13+
},
14+
{
15+
"type": "exchangers:ender_io_recipes_type",
16+
"value": "easy"
17+
}
18+
]
19+
},
1420
"pattern": [
1521
"EPE",
1622
"ECE",

0 commit comments

Comments
 (0)