Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Форматирование
Browse files Browse the repository at this point in the history
  • Loading branch information
hibanka committed Jan 19, 2020
1 parent 4c200e3 commit 7df5ed5
Show file tree
Hide file tree
Showing 17 changed files with 385 additions and 385 deletions.
142 changes: 71 additions & 71 deletions 1.7.10-mods/AdvancedSolarPanels.zs
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
// ИСПРАВЛЕНИЕ РЕЦЕПТА: ультимейт солнечный шлем
recipes.remove(<AdvancedSolarPanel:ultimate_solar_helmet>);
recipes.addShaped(<AdvancedSolarPanel:ultimate_solar_helmet>,
[[null, <AdvancedSolarPanel:BlockAdvSolarPanel:2>, null],
[<IC2:itemPartCircuitAdv>, <IC2:itemArmorQuantumHelmet:*>, <IC2:itemPartCircuitAdv>],
[<IC2:itemCable:9>, <IC2:blockElectric:5>, <IC2:itemCable:9>]]);
recipes.addShapeless(<AdvancedSolarPanel:ultimate_solar_helmet>,
[<AdvancedSolarPanel:BlockAdvSolarPanel:2>, <AdvancedSolarPanel:hybrid_solar_helmet:*>]);
recipes.remove(<AdvancedSolarPanel:ultimate_solar_helmet>);
recipes.addShaped(<AdvancedSolarPanel:ultimate_solar_helmet>,
[[null, <AdvancedSolarPanel:BlockAdvSolarPanel:2>, null],
[<IC2:itemPartCircuitAdv>, <IC2:itemArmorQuantumHelmet:*>, <IC2:itemPartCircuitAdv>],
[<IC2:itemCable:9>, <IC2:blockElectric:5>, <IC2:itemCable:9>]]);
recipes.addShapeless(<AdvancedSolarPanel:ultimate_solar_helmet>,
[<AdvancedSolarPanel:BlockAdvSolarPanel:2>, <AdvancedSolarPanel:hybrid_solar_helmet:*>]);

// Вспомогательные описания к панелям об их параметрах
// Если изменяли параметры энергии в конфиге мода, измените это и здесь

########## ВАРИАНТ 1
########## Характеристики видны сразу

var GenDay = "Генерация днём: ";
var GenNight = "Генерация ночью: ";
var MaxOutput = "Макс. выход: ";
// var MaxOutput = "Максимальный выход: ";
var Energy = "Хранилище: ";
// var Energy = "Хранилище энергии: ";
var GenDay = "Генерация днём: ";
var GenNight = "Генерация ночью: ";
var MaxOutput = "Макс. выход: ";
// var MaxOutput = "Максимальный выход: ";
var Energy = "Хранилище: ";
// var Energy = "Хранилище энергии: ";

var Panel0 = <AdvancedSolarPanel:BlockAdvSolarPanel>;
var Panel1 = <AdvancedSolarPanel:BlockAdvSolarPanel:1>;
var Panel2 = <AdvancedSolarPanel:BlockAdvSolarPanel:2>;
var Panel3 = <AdvancedSolarPanel:BlockAdvSolarPanel:3>;
var Panel0 = <AdvancedSolarPanel:BlockAdvSolarPanel>;
var Panel1 = <AdvancedSolarPanel:BlockAdvSolarPanel:1>;
var Panel2 = <AdvancedSolarPanel:BlockAdvSolarPanel:2>;
var Panel3 = <AdvancedSolarPanel:BlockAdvSolarPanel:3>;

# Улучшенная солнечная панель
Panel0.addTooltip(GenDay + format.green("8 EU/t"));
Panel0.addTooltip(GenNight + format.green("1 EU/t"));
Panel0.addTooltip(MaxOutput + format.green("32 EU/t"));
Panel0.addTooltip(Energy + format.green("32k EU"));
# Улучшенная солнечная панель
Panel0.addTooltip(GenDay + format.green("8 EU/t"));
Panel0.addTooltip(GenNight + format.green("1 EU/t"));
Panel0.addTooltip(MaxOutput + format.green("32 EU/t"));
Panel0.addTooltip(Energy + format.green("32k EU"));

# Гибридная солнечная панель
Panel1.addTooltip(GenDay + format.green("64 EU/t"));
Panel1.addTooltip(GenNight + format.green("8 EU/t"));
Panel1.addTooltip(MaxOutput + format.green("128 EU/t"));
Panel1.addTooltip(Energy + format.green("100k EU"));
# Гибридная солнечная панель
Panel1.addTooltip(GenDay + format.green("64 EU/t"));
Panel1.addTooltip(GenNight + format.green("8 EU/t"));
Panel1.addTooltip(MaxOutput + format.green("128 EU/t"));
Panel1.addTooltip(Energy + format.green("100k EU"));

# Ультимейт солнечная панель
Panel2.addTooltip(GenDay + format.green("512 EU/t"));
Panel2.addTooltip(GenNight + format.green("64 EU/t"));
Panel2.addTooltip(MaxOutput + format.green("512 EU/t"));
Panel2.addTooltip(Energy + format.green("1M EU"));
# Ультимейт солнечная панель
Panel2.addTooltip(GenDay + format.green("512 EU/t"));
Panel2.addTooltip(GenNight + format.green("64 EU/t"));
Panel2.addTooltip(MaxOutput + format.green("512 EU/t"));
Panel2.addTooltip(Energy + format.green("1M EU"));

# Квантовая солнечная панель
Panel3.addTooltip(GenDay + format.green("4096 EU/t"));
Panel3.addTooltip(GenNight + format.green("2048 EU/t"));
Panel3.addTooltip(MaxOutput + format.green("8192 EU/t"));
Panel3.addTooltip(Energy + format.green("10M EU"));
# Квантовая солнечная панель
Panel3.addTooltip(GenDay + format.green("4096 EU/t"));
Panel3.addTooltip(GenNight + format.green("2048 EU/t"));
Panel3.addTooltip(MaxOutput + format.green("8192 EU/t"));
Panel3.addTooltip(Energy + format.green("10M EU"));

########## ВАРИАНТ 2
########## Характеристики видны только если навести на панель и зажать LShift
########## На самих панелях будет надпись "Зажмите LShift для подробной информации"

var GenDay = "Генерация днём: ";
var GenNight = "Генерация ночью: ";
var MaxOutput = "Макс. выход: ";
// var MaxOutput = "Максимальный выход: ";
var Energy = "Хранилище: ";
// var Energy = "Хранилище энергии: ";
var GenDay = "Генерация днём: ";
var GenNight = "Генерация ночью: ";
var MaxOutput = "Макс. выход: ";
// var MaxOutput = "Максимальный выход: ";
var Energy = "Хранилище: ";
// var Energy = "Хранилище энергии: ";

var Panel0 = <AdvancedSolarPanel:BlockAdvSolarPanel>;
var Panel1 = <AdvancedSolarPanel:BlockAdvSolarPanel:1>;
var Panel2 = <AdvancedSolarPanel:BlockAdvSolarPanel:2>;
var Panel3 = <AdvancedSolarPanel:BlockAdvSolarPanel:3>;
var Panel0 = <AdvancedSolarPanel:BlockAdvSolarPanel>;
var Panel1 = <AdvancedSolarPanel:BlockAdvSolarPanel:1>;
var Panel2 = <AdvancedSolarPanel:BlockAdvSolarPanel:2>;
var Panel3 = <AdvancedSolarPanel:BlockAdvSolarPanel:3>;

# Улучшенная солнечная панель
Panel0.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel0.addShiftTooltip(GenDay + format.green("8 EU/t"));
Panel0.addShiftTooltip(GenNight + format.green("1 EU/t"));
Panel0.addShiftTooltip(MaxOutput + format.green("32 EU/t"));
Panel0.addShiftTooltip(Energy + format.green("32k EU"));
# Улучшенная солнечная панель
Panel0.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel0.addShiftTooltip(GenDay + format.green("8 EU/t"));
Panel0.addShiftTooltip(GenNight + format.green("1 EU/t"));
Panel0.addShiftTooltip(MaxOutput + format.green("32 EU/t"));
Panel0.addShiftTooltip(Energy + format.green("32k EU"));

# Гибридная солнечная панель
Panel1.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel1.addShiftTooltip(GenDay + format.green("64 EU/t"));
Panel1.addShiftTooltip(GenNight + format.green("8 EU/t"));
Panel1.addShiftTooltip(MaxOutput + format.green("128 EU/t"));
Panel1.addShiftTooltip(Energy + format.green("100k EU"));
# Гибридная солнечная панель
Panel1.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel1.addShiftTooltip(GenDay + format.green("64 EU/t"));
Panel1.addShiftTooltip(GenNight + format.green("8 EU/t"));
Panel1.addShiftTooltip(MaxOutput + format.green("128 EU/t"));
Panel1.addShiftTooltip(Energy + format.green("100k EU"));

# Ультимейт солнечная панель
Panel2.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel2.addShiftTooltip(GenDay + format.green("512 EU/t"));
Panel2.addShiftTooltip(GenNight + format.green("64 EU/t"));
Panel2.addShiftTooltip(MaxOutput + format.green("512 EU/t"));
Panel2.addShiftTooltip(Energy + format.green("1M EU"));
# Ультимейт солнечная панель
Panel2.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel2.addShiftTooltip(GenDay + format.green("512 EU/t"));
Panel2.addShiftTooltip(GenNight + format.green("64 EU/t"));
Panel2.addShiftTooltip(MaxOutput + format.green("512 EU/t"));
Panel2.addShiftTooltip(Energy + format.green("1M EU"));

# Квантовая солнечная панель
Panel3.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel3.addShiftTooltip(GenDay + format.green("4096 EU/t"));
Panel3.addShiftTooltip(GenNight + format.green("2048 EU/t"));
Panel3.addShiftTooltip(MaxOutput + format.green("8192 EU/t"));
Panel3.addShiftTooltip(Energy + format.green("10M EU"));
# Квантовая солнечная панель
Panel3.addTooltip("Зажмите " + format.aqua("LShift") + format.gray(" для подробной информации"));
Panel3.addShiftTooltip(GenDay + format.green("4096 EU/t"));
Panel3.addShiftTooltip(GenNight + format.green("2048 EU/t"));
Panel3.addShiftTooltip(MaxOutput + format.green("8192 EU/t"));
Panel3.addShiftTooltip(Energy + format.green("10M EU"));
10 changes: 5 additions & 5 deletions 1.7.10-mods/AppliedEnergistics2.zs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: небесный камень
recipes.addShaped(<appliedenergistics2:tile.BlockSkyStone> *8,
[[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>],
[<minecraft:obsidian>, <appliedenergistics2:item.ItemMultiMaterial:2>, <minecraft:obsidian>],
[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>]]);
recipes.addShaped(<appliedenergistics2:tile.BlockSkyStone> *8,
[[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>],
[<minecraft:obsidian>, <appliedenergistics2:item.ItemMultiMaterial:2>, <minecraft:obsidian>],
[<minecraft:obsidian>, <minecraft:obsidian>, <minecraft:obsidian>]]);

// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: алмазная пыль IC2 (из алмаза, в кварцевом дробителе)
mods.appeng.Grinder.addRecipe(<minecraft:diamond>, <IC2:itemDust2:1> * 1, 1);
mods.appeng.Grinder.addRecipe(<minecraft:diamond>, <IC2:itemDust2:1> * 1, 1);
14 changes: 7 additions & 7 deletions 1.7.10-mods/CarpentersBlocks.zs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: плитка плотника (крафт из обычной обнажённой глины, а не только раскрашенной)
recipes.remove(<CarpentersBlocks:itemCarpentersTile>);
recipes.addShaped(<CarpentersBlocks:itemCarpentersTile> *12,
[[<minecraft:stained_hardened_clay:*>, <minecraft:stained_hardened_clay:*>, <minecraft:stained_hardened_clay:*>],
[<CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>]]);
recipes.addShaped(<CarpentersBlocks:itemCarpentersTile> *12,
[[<minecraft:hardened_clay>, <minecraft:hardened_clay>, <minecraft:hardened_clay>],
[<CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>]]);
recipes.remove(<CarpentersBlocks:itemCarpentersTile>);
recipes.addShaped(<CarpentersBlocks:itemCarpentersTile> *12,
[[<minecraft:stained_hardened_clay:*>, <minecraft:stained_hardened_clay:*>, <minecraft:stained_hardened_clay:*>],
[<CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>]]);
recipes.addShaped(<CarpentersBlocks:itemCarpentersTile> *12,
[[<minecraft:hardened_clay>, <minecraft:hardened_clay>, <minecraft:hardened_clay>],
[<CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>, <CarpentersBlocks:blockCarpentersBlock:*>]]);
16 changes: 8 additions & 8 deletions 1.7.10-mods/Chisel.zs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: замшелый храмовый блок
recipes.addShaped(<chisel:mossy_templeblock> *8,
[[<chisel:templeblock>, <chisel:templeblock>, <chisel:templeblock>],
[<chisel:templeblock>, <minecraft:emerald>, <chisel:templeblock>],
[<chisel:templeblock>, <chisel:templeblock>, <chisel:templeblock>]]);
recipes.addShaped(<chisel:mossy_templeblock> *8,
[[<chisel:templeblock>, <chisel:templeblock>, <chisel:templeblock>],
[<chisel:templeblock>, <minecraft:emerald>, <chisel:templeblock>],
[<chisel:templeblock>, <chisel:templeblock>, <chisel:templeblock>]]);

// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: облако
recipes.addShaped(<chisel:cloud> *8,
[[<ore:blockGlass>, <ore:blockGlass>, <ore:blockGlass>],
[<ore:blockGlass>, <ore:gemQuartz>, <ore:blockGlass>],
[<ore:blockGlass>, <ore:blockGlass>, <ore:blockGlass>]]);
recipes.addShaped(<chisel:cloud> *8,
[[<ore:blockGlass>, <ore:blockGlass>, <ore:blockGlass>],
[<ore:blockGlass>, <ore:gemQuartz>, <ore:blockGlass>],
[<ore:blockGlass>, <ore:blockGlass>, <ore:blockGlass>]]);
4 changes: 2 additions & 2 deletions 1.7.10-mods/CustomNPC.zs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// ДОПОЛНИТЕЛЬНЫЙ РЕЦЕПТ: большая табличка
recipes.addShapeless(<customnpcs:npcBigSign>,
[<minecraft:sign>, <minecraft:sign>, <minecraft:sign>]);
recipes.addShapeless(<customnpcs:npcBigSign>,
[<minecraft:sign>, <minecraft:sign>, <minecraft:sign>]);
84 changes: 42 additions & 42 deletions 1.7.10-mods/EnderIO.zs
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
// В моде могут сломаться крафты некоторых вещей (например фотовольтовых ячеек или конденсаторов)
// Сами рецепты отображаются визуально, но скрафтить предметы не получится
# Резервуар
recipes.remove(<EnderIO:blockReservoir>);
recipes.addShaped(<EnderIO:blockReservoir> *4,
[[<ore:blockGlassHardened>, <ore:blockGlassHardened>, <ore:blockGlassHardened>],
[<ore:blockGlassHardened>, <minecraft:cauldron>, <ore:blockGlassHardened>],
[<ore:blockGlassHardened>, <ore:blockGlassHardened>, <ore:blockGlassHardened>]]);
# Резервуар
recipes.remove(<EnderIO:blockReservoir>);
recipes.addShaped(<EnderIO:blockReservoir> *4,
[[<ore:blockGlassHardened>, <ore:blockGlassHardened>, <ore:blockGlassHardened>],
[<ore:blockGlassHardened>, <minecraft:cauldron>, <ore:blockGlassHardened>],
[<ore:blockGlassHardened>, <ore:blockGlassHardened>, <ore:blockGlassHardened>]]);

# Основной конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor>);
recipes.addShaped(<EnderIO:itemBasicCapacitor>,
[[null, <minecraft:gold_nugget>, <minecraft:redstone>],
[<minecraft:gold_nugget>, <ore:ingotCopper>, <minecraft:gold_nugget>],
[<minecraft:redstone>, <minecraft:gold_nugget>, null]]);
# Основной конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor>);
recipes.addShaped(<EnderIO:itemBasicCapacitor>,
[[null, <minecraft:gold_nugget>, <minecraft:redstone>],
[<minecraft:gold_nugget>, <ore:ingotCopper>, <minecraft:gold_nugget>],
[<minecraft:redstone>, <minecraft:gold_nugget>, null]]);

# Двухслойный конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor:1>);
recipes.addShaped(<EnderIO:itemBasicCapacitor:1>,
[[null, <ore:ingotEnergeticAlloy>, null],
[<EnderIO:itemBasicCapacitor>, <ore:dustCoal>, <EnderIO:itemBasicCapacitor>],
[null, <ore:ingotEnergeticAlloy>, null]]);
# Двухслойный конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor:1>);
recipes.addShaped(<EnderIO:itemBasicCapacitor:1>,
[[null, <ore:ingotEnergeticAlloy>, null],
[<EnderIO:itemBasicCapacitor>, <ore:dustCoal>, <EnderIO:itemBasicCapacitor>],
[null, <ore:ingotEnergeticAlloy>, null]]);

# Восьмислойный конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor:2>);
recipes.addShaped(<EnderIO:itemBasicCapacitor:2>,
[[null, <ore:ingotVibrantAlloy>, null],
[<EnderIO:itemBasicCapacitor:1>, <ore:glowstone>, <EnderIO:itemBasicCapacitor:1>],
[null, <ore:ingotVibrantAlloy>, null]]);
# Восьмислойный конденсатор
recipes.remove(<EnderIO:itemBasicCapacitor:2>);
recipes.addShaped(<EnderIO:itemBasicCapacitor:2>,
[[null, <ore:ingotVibrantAlloy>, null],
[<EnderIO:itemBasicCapacitor:1>, <ore:glowstone>, <EnderIO:itemBasicCapacitor:1>],
[null, <ore:ingotVibrantAlloy>, null]]);

# Фотовольтовая ячейка
recipes.remove(<EnderIO:blockSolarPanel>);
recipes.addShaped(<EnderIO:blockSolarPanel>,
[[<ore:ingotEnergeticAlloy>, <ore:blockGlassHardened>, <ore:ingotEnergeticAlloy>],
[<ore:itemSilicon>, <ore:blockGlassHardened>, <ore:itemSilicon>],
[<ore:ingotElectricalSteel>, <minecraft:daylight_detector:*>, <ore:ingotElectricalSteel>]]);
# Фотовольтовая ячейка
recipes.remove(<EnderIO:blockSolarPanel>);
recipes.addShaped(<EnderIO:blockSolarPanel>,
[[<ore:ingotEnergeticAlloy>, <ore:blockGlassHardened>, <ore:ingotEnergeticAlloy>],
[<ore:itemSilicon>, <ore:blockGlassHardened>, <ore:itemSilicon>],
[<ore:ingotElectricalSteel>, <minecraft:daylight_detector:*>, <ore:ingotElectricalSteel>]]);

# Продвинутая фотовольтовая ячейка
recipes.remove(<EnderIO:blockSolarPanel:1>);
recipes.addShaped(<EnderIO:blockSolarPanel:1>,
[[<ore:ingotVibrantAlloy>, <EnderIO:blockFusedQuartz:2>, <ore:ingotVibrantAlloy>],
[<ore:itemVibrantCrystal>, <EnderIO:blockFusedQuartz:2>, <ore:itemVibrantCrystal>],
[<ore:ingotPulsatingIron>, <minecraft:daylight_detector:*>, <ore:ingotPulsatingIron>]]);
# Продвинутая фотовольтовая ячейка
recipes.remove(<EnderIO:blockSolarPanel:1>);
recipes.addShaped(<EnderIO:blockSolarPanel:1>,
[[<ore:ingotVibrantAlloy>, <EnderIO:blockFusedQuartz:2>, <ore:ingotVibrantAlloy>],
[<ore:itemVibrantCrystal>, <EnderIO:blockFusedQuartz:2>, <ore:itemVibrantCrystal>],
[<ore:ingotPulsatingIron>, <minecraft:daylight_detector:*>, <ore:ingotPulsatingIron>]]);

# Покрасочный механизм
recipes.remove(<EnderIO:blockPainter>);
recipes.addShaped(<EnderIO:blockPainter>,
[[<ore:gemQuartz>, <ore:gemQuartz>, <ore:gemQuartz>],
[<ore:ingotElectricalSteel>, <minecraft:diamond>, <ore:ingotElectricalSteel>],
[<ore:ingotElectricalSteel>, <EnderIO:itemMachinePart>, <ore:ingotElectricalSteel>]]);
# Покрасочный механизм
recipes.remove(<EnderIO:blockPainter>);
recipes.addShaped(<EnderIO:blockPainter>,
[[<ore:gemQuartz>, <ore:gemQuartz>, <ore:gemQuartz>],
[<ore:ingotElectricalSteel>, <minecraft:diamond>, <ore:ingotElectricalSteel>],
[<ore:ingotElectricalSteel>, <EnderIO:itemMachinePart>, <ore:ingotElectricalSteel>]]);
Loading

0 comments on commit 7df5ed5

Please sign in to comment.