Skip to content

Commit 0b48a7f

Browse files
bruberubruberu
authored
Merge pull request #1137 from MCTian-mi/extenders-and-bridges
Add recipes for delegators
2 parents eada810 + 6cd3f96 commit 0b48a7f

File tree

5 files changed

+220
-2
lines changed

5 files changed

+220
-2
lines changed

‎config/betterquesting/DefaultQuests/QuestLines/2.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,13 @@
879879
"sizeY:3": 36,
880880
"x:3": -306,
881881
"y:3": 150
882+
},
883+
"124:10": {
884+
"id:3": 1766162782,
885+
"sizeX:3": 24,
886+
"sizeY:3": 24,
887+
"x:3": 31,
888+
"y:3": 183
882889
}
883890
}
884891
}

‎config/betterquesting/DefaultQuests/Quests/2/1766162782.json

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"preRequisites:11": [
3+
105
4+
],
5+
"properties:10": {
6+
"betterquesting:10": {
7+
"desc:8": "susy.quest.db.1766162782.desc",
8+
"icon:10": {
9+
"Damage:2": 14733,
10+
"id:8": "gregtech:machine"
11+
},
12+
"name:8": "susy.quest.db.1766162782.title",
13+
"tasklogic:8": "OR"
14+
}
15+
},
16+
"questID:3": 1766162782,
17+
"tasks:9": {
18+
"0:10": {
19+
"entryLogic:8": "OR",
20+
"requiredItems:9": {
21+
"0:10": {
22+
"Count:3": 1,
23+
"Damage:2": 14737,
24+
"id:8": "gregtech:machine"
25+
},
26+
"1:10": {
27+
"Count:3": 1,
28+
"Damage:2": 14738,
29+
"id:8": "gregtech:machine"
30+
},
31+
"2:10": {
32+
"Count:3": 1,
33+
"Damage:2": 14739,
34+
"id:8": "gregtech:machine"
35+
}
36+
},
37+
"taskID:8": "bq_standard:retrieval"
38+
},
39+
"1:10": {
40+
"entryLogic:8": "OR",
41+
"index:3": 1,
42+
"requiredItems:9": {
43+
"0:10": {
44+
"Count:3": 1,
45+
"Damage:2": 14733,
46+
"id:8": "gregtech:machine"
47+
},
48+
"1:10": {
49+
"Count:3": 1,
50+
"Damage:2": 14734,
51+
"id:8": "gregtech:machine"
52+
},
53+
"2:10": {
54+
"Count:3": 1,
55+
"Damage:2": 14735,
56+
"id:8": "gregtech:machine"
57+
}
58+
},
59+
"taskID:8": "bq_standard:retrieval"
60+
},
61+
"2:10": {
62+
"entryLogic:8": "OR",
63+
"index:3": 2,
64+
"requiredItems:9": {
65+
"0:10": {
66+
"Count:3": 1,
67+
"Damage:2": 14740,
68+
"id:8": "gregtech:machine"
69+
},
70+
"1:10": {
71+
"Count:3": 1,
72+
"Damage:2": 14736,
73+
"id:8": "gregtech:machine"
74+
}
75+
},
76+
"taskID:8": "bq_standard:retrieval"
77+
}
78+
}
79+
}

‎config/betterquesting/resources/supersymmetry/lang/en_us.lang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,8 @@ susy.quest.db.1610061980.title=Trip Hammer
18581858
susy.quest.db.1610061980.desc=The §6Trip Hammer§r can swing a hammer for you!%n%nA trip hammer needs a §6Cog§r and a §6Hammer§r to work. You can put §a4§r of them around one anvil to reach the maximum efficiency.%n%nYou can insert items into a anvil using hoppers or pipes, and the product will be dropped in-world unless a chest or another type of storage is placed next to the Trip Hammer, opposite of the side where you insert the Cog.
18591859
susy.quest.db.1677924297.title=Better Oven
18601860
susy.quest.db.1677924297.desc=The §6Refractory Oven§r is an upgraded version of the §7Stone Oven§r, which has §a2.5x§r processing speed and a lower change of failure.
1861+
susy.quest.db.1766162782.title=Extenders & Bridges
1862+
susy.quest.db.1766162782.desc=§3§6Bridges§r and §6extenders§r are §cdelegators§r; they can delegate one face of your §bmachine§r or §bpipes§r onto one or more equivalent faces.%n%nBoth bridges and extenders have four variants: §3inv§r, §3tank§r, §3invtank§r, and §5universal§r. As their names suggest, they allow automation of items, fluids, items plus fluids, and, for universal ones, energy as well. §oNone§r of them, however, can attach to other §cdelegators§r.%n%n§6Bridges§r will allow §bpipes§r or §bcables§r from different directions to pass through each other in one block without turning, which will be very useful for compact logistic designs.%n%n§6Extenders§r can expand one face on your §bmachine§r to five faces. An extender has three kinds of faces: §4primary§r, §4secondary§r, and §4normal§r faces. All import/extract actions on the §4normal§r or §4secondary§r faces will be delegated to the §bmachines§r or §bpipes§r adjacent to the §4primary§r face, and the actions on the §4primary§r face will be delegated to the §4secondary§r face.%n%nApart from the §5Universal Delegators§r that require aluminum, you can now craft all §cdelegators§r for your automation.
18611863
susy.quest.db.1767849062.title=Don't Take Granite for Granted
18621864
susy.quest.db.1767849062.desc=You might encounter some §dGranite§r while mining underground. §dGranite§r is a type of §cigneous rock§r that is hard and tough, making it an ideal material for crafting §7mortars§r. So, don't ignore it!
18631865
susy.quest.db.1867050010.title=Better Kiln

‎groovy/classes/ChangeFlags.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ChangeFlags {
124124
Steel.addFlags("generate_spring", "generate_spring_small");
125125
Titanium.addFlags("generate_foil", "generate_spring", "generate_spring_small");
126126
Lead.addFlags("generate_round");
127-
Aluminium.addFlags("generate_round");
127+
Aluminium.addFlags("generate_round", "generate_rotor");
128128
Nickel.addFlags("generate_rod");
129129
Tungsten.addFlags("generate_fine_wire");
130130
Molybdenum.addFlags("generate_fine_wire");

‎groovy/postInit/mod/GregTech.groovy

Lines changed: 131 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import globals.Globals
22
import globals.GroovyUtils
33
import globals.RecyclingHelper
4-
import gregtech.api.recipes.category.RecipeCategories
54
import gregtech.common.blocks.MetaBlocks
65
import gregtech.common.blocks.MetaBlocks.*
76
import net.minecraft.init.Blocks
@@ -889,6 +888,137 @@ mods.gregtech.assembler.recipeBuilder()
889888
.circuitMeta(2)
890889
.buildAndRegister()
891890

891+
// Logistics
892+
RecyclingHelper.addShaped('gregtech:extender.inv', metaitem('extender.inv'), [
893+
[null, ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel')],
894+
[null, metaitem('hull.lv'), null],
895+
[metaitem('pipeNormalItemNickel'), ore('craftingToolWrench'), null]
896+
])
897+
898+
RecyclingHelper.addShaped('gregtech:extender.tank', metaitem('extender.tank'), [
899+
[metaitem('pipeNormalFluidSteel'), ore('craftingToolHardHammer'), null],
900+
[null, metaitem('hull.lv'), null],
901+
[null, ore('craftingToolWrench'), metaitem('pipeNormalFluidSteel')]
902+
])
903+
904+
RecyclingHelper.addShaped('gregtech:extender.inv_tank', metaitem('extender.inv_tank'), [
905+
[metaitem('pipeNormalFluidSteel'), ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel')],
906+
[null, metaitem('hull.lv'), null],
907+
[metaitem('pipeNormalItemNickel'), ore('craftingToolWrench'), metaitem('pipeNormalFluidSteel')]
908+
])
909+
910+
RecyclingHelper.addShaped('gregtech:extender.universal', metaitem('extender.universal'), [
911+
[metaitem('pipeNormalFluidAluminium'), ore('rotorAluminium'), metaitem('pipeNormalItemElectrum')],
912+
[ore('circuitLv'), metaitem('hull.mv'), ore('gearAluminium')],
913+
[metaitem('pipeNormalItemElectrum'), ore('springAluminium'), metaitem('pipeNormalFluidAluminium')]
914+
])
915+
916+
RecyclingHelper.addShaped('gregtech:bridge.inv', metaitem('bridge.inv'), [
917+
[ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel'), null],
918+
[null, metaitem('hull.lv'), null],
919+
[null, metaitem('pipeNormalItemNickel'), ore('craftingToolWrench')]
920+
])
921+
922+
RecyclingHelper.addShaped('gregtech:bridge.tank', metaitem('bridge.tank'), [
923+
[ore('craftingToolHardHammer'), null, null],
924+
[metaitem('pipeNormalFluidSteel'), metaitem('hull.lv'), metaitem('pipeNormalFluidSteel')],
925+
[null, null, ore('craftingToolWrench')]
926+
])
927+
928+
RecyclingHelper.addShaped('gregtech:bridge.inv_tank', metaitem('bridge.inv_tank'), [
929+
[ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel'), null],
930+
[metaitem('pipeNormalFluidSteel'), metaitem('hull.lv'), metaitem('pipeNormalFluidSteel')],
931+
[null, metaitem('pipeNormalItemNickel'), ore('craftingToolWrench')]
932+
])
933+
934+
RecyclingHelper.addShaped('gregtech:bridge.universal', metaitem('bridge.universal'), [
935+
[ore('springAluminium'), metaitem('pipeNormalItemElectrum'), ore('rotorAluminium')],
936+
[metaitem('pipeNormalFluidAluminium'), metaitem('hull.mv'), metaitem('pipeNormalFluidAluminium')],
937+
[ore('circuitLv'), metaitem('pipeNormalItemElectrum'), ore('gearAluminium')]
938+
])
939+
940+
mods.gregtech.assembler.recipeBuilder()
941+
.inputs(metaitem('pipeNormalItemNickel') * 2)
942+
.inputs(metaitem('hull.lv'))
943+
.outputs(metaitem('extender.inv'))
944+
.duration(200)
945+
.EUt(16)
946+
.circuitMeta(2)
947+
.buildAndRegister()
948+
949+
mods.gregtech.assembler.recipeBuilder()
950+
.inputs(metaitem('pipeNormalFluidSteel') * 2)
951+
.inputs(metaitem('hull.lv'))
952+
.outputs(metaitem('extender.tank'))
953+
.duration(200)
954+
.EUt(16)
955+
.circuitMeta(2)
956+
.buildAndRegister()
957+
958+
mods.gregtech.assembler.recipeBuilder()
959+
.inputs(metaitem('pipeNormalItemNickel') * 2)
960+
.inputs(metaitem('pipeNormalFluidSteel') * 2)
961+
.inputs(metaitem('hull.lv'))
962+
.outputs(metaitem('extender.inv_tank'))
963+
.duration(200)
964+
.EUt(16)
965+
.circuitMeta(3)
966+
.buildAndRegister()
967+
968+
mods.gregtech.assembler.recipeBuilder()
969+
.inputs(metaitem('pipeNormalItemElectrum') * 2)
970+
.inputs(metaitem('pipeNormalFluidAluminium') * 2)
971+
.inputs(ore('rotorAluminium'))
972+
.inputs(ore('gearAluminium'))
973+
.inputs(ore('springAluminium'))
974+
.inputs(metaitem('hull.mv'))
975+
.outputs(metaitem('extender.universal'))
976+
.duration(200)
977+
.EUt(64)
978+
.circuitMeta(3)
979+
.buildAndRegister()
980+
981+
mods.gregtech.assembler.recipeBuilder()
982+
.inputs(metaitem('pipeNormalItemNickel') * 2)
983+
.inputs(metaitem('hull.lv'))
984+
.outputs(metaitem('bridge.inv'))
985+
.duration(200)
986+
.EUt(16)
987+
.circuitMeta(4)
988+
.buildAndRegister()
989+
990+
mods.gregtech.assembler.recipeBuilder()
991+
.inputs(metaitem('pipeNormalFluidSteel') * 2)
992+
.inputs(metaitem('hull.lv'))
993+
.outputs(metaitem('bridge.tank'))
994+
.duration(200)
995+
.EUt(16)
996+
.circuitMeta(4)
997+
.buildAndRegister()
998+
999+
mods.gregtech.assembler.recipeBuilder()
1000+
.inputs(metaitem('pipeNormalItemNickel') * 2)
1001+
.inputs(metaitem('pipeNormalFluidSteel') * 2)
1002+
.inputs(metaitem('hull.lv'))
1003+
.outputs(metaitem('bridge.inv_tank'))
1004+
.duration(200)
1005+
.EUt(16)
1006+
.circuitMeta(5)
1007+
.buildAndRegister()
1008+
1009+
mods.gregtech.assembler.recipeBuilder()
1010+
.inputs(metaitem('pipeNormalItemElectrum') * 2)
1011+
.inputs(metaitem('pipeNormalFluidAluminium') * 2)
1012+
.inputs(ore('rotorAluminium'))
1013+
.inputs(ore('gearAluminium'))
1014+
.inputs(ore('springAluminium'))
1015+
.inputs(metaitem('hull.mv'))
1016+
.outputs(metaitem('bridge.universal'))
1017+
.duration(200)
1018+
.EUt(64)
1019+
.circuitMeta(5)
1020+
.buildAndRegister()
1021+
8921022
// Electrolytic Cell
8931023
RecyclingHelper.addShaped('gregtech:electrolytic_cell', metaitem('electrolytic_cell'), [
8941024
[ore('plateSteel'), ore('circuitLv'), ore('plateSteel')],

0 commit comments

Comments
 (0)