Skip to content

Commit

Permalink
Merge branch 'master-ceu' into 1.13.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruberu
bruberu authored Dec 16, 2024
2 parents dbb237a + 0b48a7f commit 672d526
Show file tree
Hide file tree
Showing 5 changed files with 221 additions and 3 deletions.
7 changes: 7 additions & 0 deletions config/betterquesting/DefaultQuests/QuestLines/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,13 @@
"sizeY:3": 36,
"x:3": -306,
"y:3": 150
},
"124:10": {
"id:3": 1766162782,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 31,
"y:3": 183
}
}
}
79 changes: 79 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/2/1766162782.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"preRequisites:11": [
105
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.1766162782.desc",
"icon:10": {
"Damage:2": 14733,
"id:8": "gregtech:machine"
},
"name:8": "susy.quest.db.1766162782.title",
"tasklogic:8": "OR"
}
},
"questID:3": 1766162782,
"tasks:9": {
"0:10": {
"entryLogic:8": "OR",
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"Damage:2": 14737,
"id:8": "gregtech:machine"
},
"1:10": {
"Count:3": 1,
"Damage:2": 14738,
"id:8": "gregtech:machine"
},
"2:10": {
"Count:3": 1,
"Damage:2": 14739,
"id:8": "gregtech:machine"
}
},
"taskID:8": "bq_standard:retrieval"
},
"1:10": {
"entryLogic:8": "OR",
"index:3": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"Damage:2": 14733,
"id:8": "gregtech:machine"
},
"1:10": {
"Count:3": 1,
"Damage:2": 14734,
"id:8": "gregtech:machine"
},
"2:10": {
"Count:3": 1,
"Damage:2": 14735,
"id:8": "gregtech:machine"
}
},
"taskID:8": "bq_standard:retrieval"
},
"2:10": {
"entryLogic:8": "OR",
"index:3": 2,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"Damage:2": 14740,
"id:8": "gregtech:machine"
},
"1:10": {
"Count:3": 1,
"Damage:2": 14736,
"id:8": "gregtech:machine"
}
},
"taskID:8": "bq_standard:retrieval"
}
}
}
4 changes: 3 additions & 1 deletion config/betterquesting/resources/supersymmetry/lang/en_us.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ susy.quest.db.42.desc=§bNickel§r is an early game metal which can only be made
susy.quest.db.43.title=Glass Tubes
susy.quest.db.43.desc=The main objective of the Industrial Age is §evacuum tubes§r. Our first step is making §aglass tubes§r, with a ball mold and glass dust. %n
susy.quest.db.44.title=Pyrite and Sulfur
susy.quest.db.44.desc=§6Pyrite §fcan be obtained by digging in §6Galena §f§for §6Sphalerite §fveins. Those veins can be found in the first two layers of the crust. You can even find pure Pyrite vein if you are lucky!%n%nPyrite dust can be roasted to obtain Banded Iron dust and elemental §6Sulfur§f, which will be used in preocessing rubber.%n%nAlternatively, you could go to the third crust of the layer and find Sulfur ore there, also known as §6Sulfur Deposit.§f%n%nTo complete this quest, you can complete any of the Retrieval Task.
susy.quest.db.44.desc=§6Pyrite §fcan be obtained by digging in §6Galena §f§for §6Sphalerite §fveins. Those veins can be found in the first two layers of the crust. You can even find pure Pyrite vein if you are lucky!%n%nPyrite dust can be roasted to obtain Banded Iron dust and elemental §6Sulfur§f, which will be used in processing rubber.%n%nAlternatively, you could go to the third crust of the layer and find Sulfur ore there, also known as §6Sulfur Deposit.§f%n%nTo complete this quest, you can complete any of the Retrieval Task.
susy.quest.db.45.title=Steam Mixer
susy.quest.db.45.desc=The §7§6Steam Mixer §rmixes several dusts or fluids together. It will be required for mixing Sulfur Trioxide and Water to create H2SO4. %n%nIf some mixer recipes require a §6programmed circuit§r, you can §aclick §ron the "G" in the bottom right of the Mixer to change the configuration.
susy.quest.db.46.title=H2SO4
Expand Down Expand Up @@ -1883,6 +1883,8 @@ susy.quest.db.1677924297.title=Better Oven
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.
susy.quest.db.1766408250.title=The Road to Rubylith
susy.quest.db.1766408250.desc=You may have noticed the rather complicated questline below. It all heads towards §7rubylith§r, which is essentially a really chemically complex sheet of plastic that you use to, essentially, stencil stencils.%n%nDo not worry about automating this; you will only need §76§r to get through HV! Even still, we wish you good luck.
susy.quest.db.1766162782.title=Extenders & Bridges
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.
susy.quest.db.1767849062.title=Don't Take Granite for Granted
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!
susy.quest.db.1786950658.title=Zener Diode
Expand Down
2 changes: 1 addition & 1 deletion groovy/classes/ChangeFlags.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ class ChangeFlags {
Steel.addFlags("generate_spring", "generate_spring_small");
Titanium.addFlags("generate_foil", "generate_spring", "generate_spring_small");
Lead.addFlags("generate_round");
Aluminium.addFlags("generate_round");
Nickel.addFlags("generate_rod", "generate_foil");
Aluminium.addFlags("generate_round", "generate_rotor");
Tungsten.addFlags("generate_fine_wire");
Molybdenum.addFlags("generate_fine_wire");
Tantalum.addFlags("generate_rod");
Expand Down
132 changes: 131 additions & 1 deletion groovy/postInit/mod/GregTech.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import globals.Globals
import globals.GroovyUtils
import globals.RecyclingHelper
import gregtech.api.recipes.category.RecipeCategories
import gregtech.common.blocks.MetaBlocks
import gregtech.common.blocks.MetaBlocks.*
import net.minecraft.init.Blocks
Expand Down Expand Up @@ -895,6 +894,137 @@ mods.gregtech.assembler.recipeBuilder()
.circuitMeta(2)
.buildAndRegister()

// Logistics
RecyclingHelper.addShaped('gregtech:extender.inv', metaitem('extender.inv'), [
[null, ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel')],
[null, metaitem('hull.lv'), null],
[metaitem('pipeNormalItemNickel'), ore('craftingToolWrench'), null]
])

RecyclingHelper.addShaped('gregtech:extender.tank', metaitem('extender.tank'), [
[metaitem('pipeNormalFluidSteel'), ore('craftingToolHardHammer'), null],
[null, metaitem('hull.lv'), null],
[null, ore('craftingToolWrench'), metaitem('pipeNormalFluidSteel')]
])

RecyclingHelper.addShaped('gregtech:extender.inv_tank', metaitem('extender.inv_tank'), [
[metaitem('pipeNormalFluidSteel'), ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel')],
[null, metaitem('hull.lv'), null],
[metaitem('pipeNormalItemNickel'), ore('craftingToolWrench'), metaitem('pipeNormalFluidSteel')]
])

RecyclingHelper.addShaped('gregtech:extender.universal', metaitem('extender.universal'), [
[metaitem('pipeNormalFluidAluminium'), ore('rotorAluminium'), metaitem('pipeNormalItemElectrum')],
[ore('circuitLv'), metaitem('hull.mv'), ore('gearAluminium')],
[metaitem('pipeNormalItemElectrum'), ore('springAluminium'), metaitem('pipeNormalFluidAluminium')]
])

RecyclingHelper.addShaped('gregtech:bridge.inv', metaitem('bridge.inv'), [
[ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel'), null],
[null, metaitem('hull.lv'), null],
[null, metaitem('pipeNormalItemNickel'), ore('craftingToolWrench')]
])

RecyclingHelper.addShaped('gregtech:bridge.tank', metaitem('bridge.tank'), [
[ore('craftingToolHardHammer'), null, null],
[metaitem('pipeNormalFluidSteel'), metaitem('hull.lv'), metaitem('pipeNormalFluidSteel')],
[null, null, ore('craftingToolWrench')]
])

RecyclingHelper.addShaped('gregtech:bridge.inv_tank', metaitem('bridge.inv_tank'), [
[ore('craftingToolHardHammer'), metaitem('pipeNormalItemNickel'), null],
[metaitem('pipeNormalFluidSteel'), metaitem('hull.lv'), metaitem('pipeNormalFluidSteel')],
[null, metaitem('pipeNormalItemNickel'), ore('craftingToolWrench')]
])

RecyclingHelper.addShaped('gregtech:bridge.universal', metaitem('bridge.universal'), [
[ore('springAluminium'), metaitem('pipeNormalItemElectrum'), ore('rotorAluminium')],
[metaitem('pipeNormalFluidAluminium'), metaitem('hull.mv'), metaitem('pipeNormalFluidAluminium')],
[ore('circuitLv'), metaitem('pipeNormalItemElectrum'), ore('gearAluminium')]
])

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemNickel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('extender.inv'))
.duration(200)
.EUt(16)
.circuitMeta(2)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalFluidSteel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('extender.tank'))
.duration(200)
.EUt(16)
.circuitMeta(2)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemNickel') * 2)
.inputs(metaitem('pipeNormalFluidSteel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('extender.inv_tank'))
.duration(200)
.EUt(16)
.circuitMeta(3)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemElectrum') * 2)
.inputs(metaitem('pipeNormalFluidAluminium') * 2)
.inputs(ore('rotorAluminium'))
.inputs(ore('gearAluminium'))
.inputs(ore('springAluminium'))
.inputs(metaitem('hull.mv'))
.outputs(metaitem('extender.universal'))
.duration(200)
.EUt(64)
.circuitMeta(3)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemNickel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('bridge.inv'))
.duration(200)
.EUt(16)
.circuitMeta(4)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalFluidSteel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('bridge.tank'))
.duration(200)
.EUt(16)
.circuitMeta(4)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemNickel') * 2)
.inputs(metaitem('pipeNormalFluidSteel') * 2)
.inputs(metaitem('hull.lv'))
.outputs(metaitem('bridge.inv_tank'))
.duration(200)
.EUt(16)
.circuitMeta(5)
.buildAndRegister()

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('pipeNormalItemElectrum') * 2)
.inputs(metaitem('pipeNormalFluidAluminium') * 2)
.inputs(ore('rotorAluminium'))
.inputs(ore('gearAluminium'))
.inputs(ore('springAluminium'))
.inputs(metaitem('hull.mv'))
.outputs(metaitem('bridge.universal'))
.duration(200)
.EUt(64)
.circuitMeta(5)
.buildAndRegister()

// Electrolytic Cell
RecyclingHelper.addShaped('gregtech:electrolytic_cell', metaitem('electrolytic_cell'), [
[ore('plateSteel'), ore('circuitLv'), ore('plateSteel')],
Expand Down

0 comments on commit 672d526

Please sign in to comment.