Skip to content

Commit 310acc8

Browse files
committed
Revert "Remove polyethylene requirement from Basic Upgrades"
This reverts commit 46f0372.
1 parent 46f0372 commit 310acc8

File tree

6 files changed

+23
-18
lines changed

6 files changed

+23
-18
lines changed

src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "modern_industrialization:chemical_reactor",
2+
"parent": "modern_industrialization:basic_upgrade",
33
"criteria": {
44
"checkInv": {
55
"conditions": {

src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "modern_industrialization:assembler",
2+
"parent": "modern_industrialization:chemical_reactor",
33
"criteria": {
44
"checkInv": {
55
"conditions": {

src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ public void generate(HolderLookup.Provider registries, Consumer<AdvancementHolde
212212
var quantumCircuit = createBasic(consumer, "quantum_circuit", mixedIngotIridium, AdvancementType.GOAL, "Mobius Strip Eigenvalues", "Craft a Quantum Circuit", existingFileHelper);
213213
var fusionReactor = createBasic(consumer, "fusion_reactor", quantumCircuit, AdvancementType.CHALLENGE, "Enslaved Star Core", "Craft a Fusion Reactor to produce insane amount of energy", existingFileHelper);
214214
var plasmaTurbine = createBasic(consumer, "plasma_turbine", fusionReactor, "Better than Nuclear Fission", "Craft a Plasma Turbine to transform Helium Plasma into energy", existingFileHelper);
215-
var basicUpgrade = createBasic(consumer, "basic_upgrade", assembler, AdvancementType.GOAL, "Machine Speedup", "Craft a Basic Upgrade to increase the maximum speed of an electric recipe", existingFileHelper);
216-
var advancedUpgrade = createBasic(consumer, "advanced_upgrade", chemicalReactor, "Machine Speedup-Speedup", "Craft a Advanced Upgrade", existingFileHelper);
215+
var basicUpgrade = createBasic(consumer, "basic_upgrade", chemicalReactor, AdvancementType.GOAL, "Machine Speedup", "Craft a Basic Upgrade to increase the maximum speed of an electric recipe", existingFileHelper);
216+
var advancedUpgrade = createBasic(consumer, "advanced_upgrade", basicUpgrade, "Machine Speedup-Speedup", "Craft a Advanced Upgrade", existingFileHelper);
217217
var turboUpgrade = createBasic(consumer, "turbo_upgrade", digitalCircuit, "Gotta go Fast", "Craft a Turbo Upgrade", existingFileHelper);
218218
var highlyAdvancedUpgrade = createBasic(consumer, "highly_advanced_upgrade", processingUnit, "I'm speed", "Craft an Highly Advanced Upgrade", existingFileHelper);
219219
var quantumUpgrade = createBasic(consumer, "quantum_upgrade", quantumCircuit, AdvancementType.GOAL, "Time Dilation", "Craft a Quantum Upgrade to unlock unlimited recipe speed", existingFileHelper);

src/main/resources/assets/modern_industrialization/patchouli_books/book/en_us/entries/electric_age/basic_machines.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,7 @@
3030
{
3131
"type": "text",
3232
"text": "We strongly suggest that you automate Machine Hull, Analog Circuits, Motors, Pistons, Robot Arms and Conveyor Belts using Assemblers as soon as possible, that will make crafting electric machines basically free!"
33-
},
34-
{
35-
"type": "spotlight",
36-
"title": "Redstone Control Modules",
37-
"item": "modern_industrialization:redstone_control_module",
38-
"text": "A Redstone Control Module can be used to control the behavior of electric machines and multiblocks with redstone signals.$(br2)Configure the module in your hand, then insert it into the machine or multiblock controller."
39-
},
40-
{
41-
"type": "spotlight",
42-
"title": "Overclock Upgrades",
43-
"item": "modern_industrialization:basic_upgrade",
44-
"text": "Regular electric machines have an overclock capped at 32 EU/t, and electric multiblocks have an overclock capped at 128 EU/t.$(br2)In the machine or multiblock's menu, add upgades to increase its maximum overclock! Check REI for the exact amounts."
4533
}
4634
],
4735
"sortnum": 105
48-
}
36+
}

src/main/resources/assets/modern_industrialization/patchouli_books/book/en_us/entries/midgame/upgrades.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
"category": "modern_industrialization:midgame",
44
"icon": "modern_industrialization:basic_upgrade",
55
"pages": [
6+
{
7+
"type": "spotlight",
8+
"title": "Redstone Control Modules",
9+
"item": "modern_industrialization:redstone_control_module",
10+
"text": "A Redstone Control Module can be used to control the behavior of electric machines and multiblocks with redstone signals.$(br2)Configure the module in your hand, then insert it into the machine or multiblock controller."
11+
},
12+
{
13+
"type": "spotlight",
14+
"title": "Overclock Upgrades",
15+
"item": "modern_industrialization:basic_upgrade",
16+
"text": "You know that regular electric machines have an overclock capped at 32 EU/t, and electric multiblocks have an overclock capped at 128 EU/t?$(br2)In the machine or multiblock's menu, add upgades to increase its maximum overclock! Check REI for the exact amounts."
17+
},
618
{
719
"type": "spotlight",
820
"title": "Machine Hull Upgrades",

src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@
2020
"amount": 1
2121
}
2222
],
23+
24+
"fluid_inputs": {
25+
"fluid" : "modern_industrialization:polyethylene",
26+
"amount" : 500
27+
},
2328
"item_outputs": [
2429
{
2530
"item": "modern_industrialization:basic_upgrade",
2631
"amount": 4
2732
}
2833
]
29-
}
34+
}

0 commit comments

Comments
 (0)