Skip to content

Commit d8278dd

Browse files
committed
Improve handling and actually directly support connecting QIO exporters to transporters
- Directly uses transporter methods which should provide slightly better performance (and allows it to bypass the transporter's pull limit) - Supports using round-robin mode when inserting into transporters - Supports attempting to accept rejects that got sent back by transporters - Visually connects to transporters (#7973)
1 parent 7a66935 commit d8278dd

29 files changed

+407
-127
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// 1.20.4 2024-04-10T13:41:13.3912367 ComputerHelp: mekanism
1+
// 1.20.4 2024-04-12T14:20:34.6038264 ComputerHelp: mekanism
22
94b6d2a203a16827e2f54f7489e90159992acdb3 data/mekanism/computer_help/enums.csv
33
b38b847919651e2a55bc3eb8c719b2d92f76de7a data/mekanism/computer_help/enums.json
4-
5b1c57dd4101a8f89dc1bef99214f8aafd4190e6 data/mekanism/computer_help/jekyll.md
5-
3d72ee50a142f8c4ff9b8b1d6c07e31cbda17d79 data/mekanism/computer_help/methods.csv
6-
f2c67736745f50fe7e3c2a8b38a514903448aab7 data/mekanism/computer_help/methods.json
4+
6ffeddf5dfcdecf24b3ae2bf8a3c6e3de5cdc135 data/mekanism/computer_help/jekyll.md
5+
b7dd11cb6ba0cfc15df40a068961627817a2024b data/mekanism/computer_help/methods.csv
6+
499be0d67fa83cef4d333dec880588d372970077 data/mekanism/computer_help/methods.json

src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.4 2024-03-23T19:45:40.1108075 Loot Tables
1+
// 1.20.4 2024-04-12T14:49:14.06478 Loot Tables
22
b4a05e7ba50da33988cfbf7827826c6dc5a141d9 data/mekanism/loot_tables/blocks/advanced_bin.json
33
cd266e7b4a5bde833aa11e1caf17d86631197626 data/mekanism/loot_tables/blocks/advanced_chemical_tank.json
44
6829ad29ae722d1ef741fc103dfd5704c1874a66 data/mekanism/loot_tables/blocks/advanced_combining_factory.json
@@ -118,7 +118,7 @@ ac8c749139a88f16f2cedc0db95868f2b3611d8a data/mekanism/loot_tables/blocks/laser.
118118
2b01deec8c7285b0d547bff83c96017677d024e0 data/mekanism/loot_tables/blocks/laser_amplifier.json
119119
c6a9162acef0b96d782673731b24ded6d409269b data/mekanism/loot_tables/blocks/laser_tractor_beam.json
120120
3deff265b88e591833bee438fbe99d447d41a565 data/mekanism/loot_tables/blocks/lead_ore.json
121-
b7635eb5c7e8ebd0d9ce528898b568d67a57f5f0 data/mekanism/loot_tables/blocks/logistical_sorter.json
121+
bc8dedaaf9a8a32a70f484810799914e1423a21b data/mekanism/loot_tables/blocks/logistical_sorter.json
122122
b98160f90c087eb28f0e08ddec86f369e5977270 data/mekanism/loot_tables/blocks/metallurgic_infuser.json
123123
b2309045f264fb4c536cc99f565760ab90990ca9 data/mekanism/loot_tables/blocks/modification_station.json
124124
c93f6d48138eea1ef6219fbe4a261e1219ca0b0c data/mekanism/loot_tables/blocks/nutritional_liquifier.json
@@ -136,7 +136,7 @@ c93f6d48138eea1ef6219fbe4a261e1219ca0b0c data/mekanism/loot_tables/blocks/nutrit
136136
8264c1d2b3ac806201a2e22573779d0954d6ae84 data/mekanism/loot_tables/blocks/purification_chamber.json
137137
4b9a5c6c9fe76acc35845a7c717f8386652707e3 data/mekanism/loot_tables/blocks/qio_dashboard.json
138138
d03909e03fcdcbfeb73e47ade1d18da374efc628 data/mekanism/loot_tables/blocks/qio_drive_array.json
139-
3753c4dc0ede114e1e828e2fe6984bd77055b7ac data/mekanism/loot_tables/blocks/qio_exporter.json
139+
9c07144842b598c80f6941de00c28cc9510b944f data/mekanism/loot_tables/blocks/qio_exporter.json
140140
d26c883389d1ac6139397f6c6ad5dc231bd8b2d3 data/mekanism/loot_tables/blocks/qio_importer.json
141141
e683f63154bde2c9cc77e26e2714fe6d51223c37 data/mekanism/loot_tables/blocks/qio_redstone_adapter.json
142142
5f09276294e2367e32102c287f0e2a61facee062 data/mekanism/loot_tables/blocks/quantum_entangloporter.json
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 1.20.4 2024-04-01T21:19:24.9036575 Languages: en_us for mod: mekanism
1+
// 1.20.4 2024-04-12T14:20:34.6108268 Languages: en_us for mod: mekanism
22
ce340f94e77f96d41d2e1c4bccddc22c26e91c9e assets/mekanism/lang/en_au.json
33
ce340f94e77f96d41d2e1c4bccddc22c26e91c9e assets/mekanism/lang/en_gb.json
4-
55e912bacc730eea56c7df9401c46483840c8c67 assets/mekanism/lang/en_ud.json
5-
79d6dec6230fd5aa9f8d92077e51b6304dcfd670 assets/mekanism/lang/en_us.json
4+
18238c873047713022a1b4fef32776564ad859c2 assets/mekanism/lang/en_ud.json
5+
b2b3dfdfefa547da9edeed13ba3459c5a2a61719 assets/mekanism/lang/en_us.json

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,8 @@
14281428
"pigment.mekanism.yellow": "ʇuǝɯᵷᴉԀ ʍoꞁꞁǝ⅄",
14291429
"qio.mekanism.compensate_tooltip": "¿ɹoɟ ǝʇɐsuǝdɯoɔ oʇ ᵷuᴉʎɹʇ noʎ ǝɹɐ ʇɐɥM",
14301430
"qio.mekanism.export_without_filter": ":ɹǝʇꞁᴉℲ ʇnoɥʇᴉM ʇɹodxƎ",
1431+
"qio.mekanism.exporter.round_robin": ":uᴉqoɹ punoᴚ",
1432+
"qio.mekanism.exporter.round_robin.description": "˙sɯǝʇᴉ ᵷuᴉpuǝs uǝɥʍ sǝᴉɹoʇuǝʌuᴉ pǝʇɔǝuuoɔ ꞁꞁɐ uǝǝʍʇǝq sǝꞁɔʎɔ 'ɹǝʇɹodsuɐɹʇ ɐ oʇ pǝʇɔǝuuoɔ uǝɥM",
14311433
"qio.mekanism.fuzzy_mode": "%s :⟘ᗺN ᵷuᴉɹouᵷI",
14321434
"qio.mekanism.import_without_filter": ":ɹǝʇꞁᴉℲ ʇnoɥʇᴉM ʇɹodɯI",
14331435
"qio.mekanism.item_type_undefined": "pǝuᴉɟǝpun ǝdʎʇ ɯǝʇI",

src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,8 @@
14311431
"pigment.mekanism.yellow": "Yellow Pigment",
14321432
"qio.mekanism.compensate_tooltip": "What are you trying to compensate for?",
14331433
"qio.mekanism.export_without_filter": "Export Without Filter:",
1434+
"qio.mekanism.exporter.round_robin": "Round robin:",
1435+
"qio.mekanism.exporter.round_robin.description": "When connected to a transporter, cycles between all connected inventories when sending items.",
14341436
"qio.mekanism.fuzzy_mode": "Ignoring NBT: %1$s",
14351437
"qio.mekanism.import_without_filter": "Import Without Filter:",
14361438
"qio.mekanism.item_type_undefined": "Item type undefined",

src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3803,12 +3803,22 @@ methods:
38033803
returns:
38043804
javaType: boolean
38053805
type: boolean
3806+
- methodName: isRoundRobin
3807+
returns:
3808+
javaType: boolean
3809+
type: boolean
38063810
- methodName: setExportsWithoutFilter
38073811
params:
38083812
- javaType: boolean
38093813
name: value
38103814
type: boolean
38113815
requiresPublicSecurity: true
3816+
- methodName: setRoundRobin
3817+
params:
3818+
- javaType: boolean
3819+
name: value
3820+
type: boolean
3821+
requiresPublicSecurity: true
38123822
QIO Importer:
38133823
- methodName: getImportWithoutFilter
38143824
returns:

src/datagen/generated/mekanism/data/mekanism/computer_help/methods.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,9 @@ QIO Drive Array,getFrequencyItemTypeCount,,Number (long),,false,Requires a frequ
642642
QIO Drive Array,getFrequencyItemTypePercentage,,Number (double),,false,Requires a frequency to be selected
643643
QIO Drive Array,getSlotCount,,Number (int),,false,
644644
QIO Exporter,getExportWithoutFilter,,boolean,,false,
645+
QIO Exporter,isRoundRobin,,boolean,,false,
645646
QIO Exporter,setExportsWithoutFilter,value: boolean,,,true,
647+
QIO Exporter,setRoundRobin,value: boolean,,,true,
646648
QIO Importer,getImportWithoutFilter,,boolean,,false,
647649
QIO Importer,setImportsWithoutFilter,value: boolean,,,true,
648650
QIO Machine,createFrequency,name: String,,,true,Requires frequency to not already exist and for it to be public so that it can make it as the player who owns the block. Also sets the frequency after creation

src/datagen/generated/mekanism/data/mekanism/computer_help/methods.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5613,6 +5613,13 @@
56135613
"javaType": "boolean"
56145614
}
56155615
},
5616+
{
5617+
"methodName": "isRoundRobin",
5618+
"returns": {
5619+
"type": "boolean",
5620+
"javaType": "boolean"
5621+
}
5622+
},
56165623
{
56175624
"methodName": "setExportsWithoutFilter",
56185625
"params": [
@@ -5623,6 +5630,17 @@
56235630
}
56245631
],
56255632
"requiresPublicSecurity": true
5633+
},
5634+
{
5635+
"methodName": "setRoundRobin",
5636+
"params": [
5637+
{
5638+
"type": "boolean",
5639+
"javaType": "boolean",
5640+
"name": "value"
5641+
}
5642+
],
5643+
"requiresPublicSecurity": true
56265644
}
56275645
],
56285646
"QIO Importer": [

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/logistical_sorter.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"pools": [
44
{
55
"bonus_rolls": 0.0,
6+
"conditions": [
7+
{
8+
"condition": "minecraft:survives_explosion"
9+
}
10+
],
611
"entries": [
712
{
813
"type": "minecraft:item",
@@ -20,10 +25,6 @@
2025
"function": "minecraft:copy_name",
2126
"source": "block_entity"
2227
},
23-
{
24-
"type": "mekanism:inventory_slots",
25-
"function": "mekanism:copy_containers"
26-
},
2728
{
2829
"function": "mekanism:copy_to_attachments",
2930
"ops": [

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_exporter.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
{
3939
"source": "controlType",
4040
"target": "mekanism:redstone_control"
41+
},
42+
{
43+
"source": "roundRobin",
44+
"target": "mekanism:round_robin"
4145
}
4246
],
4347
"source": "block_entity"

0 commit comments

Comments
 (0)