Skip to content

Commit

Permalink
fix: 🔴Remove AE2 Wireless terminals
Browse files Browse the repository at this point in the history
This terminals mostly totally repeated native AE2 terminals. Also, they caused bugs and item removals.

Originally, `AE2 Wireless Terminals` mod was added for E2E when there was no terminals in AE2 itself.
  • Loading branch information
Krutoy242 committed Feb 27, 2024
1 parent 2584556 commit 9a3f0d3
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 66 deletions.
50 changes: 0 additions & 50 deletions config/AE2WirelessTerminals.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/category/creative.zs
Original file line number Diff line number Diff line change
Expand Up @@ -545,18 +545,6 @@ craft.make(creativeCube, ['pretty',

recipes.addHiddenShapeless('Recharging cube', creativeCube, [<mekanism:energycube>.withTag({ tier: 4, mekData: {} })]);

// [Creative Wireless Ultimate Terminal] from [Creative Energy Cube][+4]
craft.make(<ae2wtlib:wut_creative>, ['pretty',
' e ',
'r Ïž i',
' W '], {
'e': <wct:wct:*>.withTag({}), // Wireless Crafting Terminal
'r': <wpt:wpt:*>.withTag({}), // Wireless Pattern Terminal
'Ïž': utils.reuse(creativeCube), // Creative Energy Cube
'i': <wft:wft:*>.withTag({}), // Wireless Fluid Terminal
'W': <wit:wit:*>.withTag({}), // Wireless Interface Terminal
});

// [Creative Vending Upgrade] from [Lamp of Cinders][+18]
craft.make(<storagedrawers:upgrade_creative:1>, ['pretty',
'* B T T ♦ T T B *',
Expand Down
30 changes: 30 additions & 0 deletions scripts/mods/appliedenergistics.zs
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,36 @@ craft.make(<appliedenergistics2:material:58>, ['pretty',
'M': <appliedenergistics2:part:440>, // ME Interface
});

val terminalIngrs = {
'F': <ore:pearlFluix>, // Fluix Pearl
'W': <ae2stuff:wireless>,
'M': <appliedenergistics2:quantum_ring>, // ME Quantum Ring
'C': <appliedenergistics2:part:360>, // ME Crafting Terminal
'â—‹': <appliedenergistics2:part:520>, // ME Fluid Terminal
'P': <appliedenergistics2:part:340>, // ME Pattern Terminal
} as IIngredient[string];

// [Wireless Crafting Terminal]
craft.remake(<appliedenergistics2:wireless_crafting_terminal>, ['pretty',
' C ',
'F W F',
'F M F'], terminalIngrs
);

// [Wireless Fluid Terminal]
craft.remake(<appliedenergistics2:wireless_fluid_terminal>, ['pretty',
' â—‹ ',
'F W F',
'F M F'], terminalIngrs
);

// [Wireless Pattern Terminal]
craft.remake(<appliedenergistics2:wireless_pattern_terminal>, ['pretty',
' P ',
'F W F',
'F M F'], terminalIngrs
);

// ---------------------------------
// Storage Component rework
// ---------------------------------
Expand Down
4 changes: 0 additions & 4 deletions scripts/mods/thaumcraft_aspects.zs
Original file line number Diff line number Diff line change
Expand Up @@ -2222,10 +2222,6 @@ val removeItemAspectList = [
<thermalexpansion:morb>,
<thermalexpansion:satchel:*>,
<travelersbackpack:travelers_backpack:*>,
<wct:wct>,
<wft:wft>,
<wit:wit>,
<wpt:wpt>,
<endreborn:food_ender_flesh>,
<aeadditions:storage.physical>,
<aeadditions:storage.physical:1>,
Expand Down

0 comments on commit 9a3f0d3

Please sign in to comment.