diff --git a/kubejs/assets/gtceu/lang/de.json b/kubejs/assets/gtceu/lang/de.json index f62a2e5ee..997820ab3 100644 --- a/kubejs/assets/gtceu/lang/de.json +++ b/kubejs/assets/gtceu/lang/de.json @@ -121,9 +121,6 @@ "block.gtceu.universal_crystallizer": "", "gtceu.universal_crystallizer": "", "gtceu.multiblock.universal_crystallizer.description": "", - "block.gtceu.actualization_chamber": "", - "gtceu.actualization_chamber": "", - "gtceu.multiblock.actualization_chamber.description": "", "block.gtceu.cryococcal_reverberator": "", "gtceu.reverberation": "", "block.gtceu.atmospheric_accumulator": "", diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 5e72e652c..2d02a85e8 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -118,9 +118,6 @@ "block.gtceu.universal_crystallizer": "Universal Crystallizer", "gtceu.universal_crystallizer": "Crystallization", "gtceu.multiblock.universal_crystallizer.description": "§7An immense device, capable of turning raw materials into complex matters.", - "block.gtceu.actualization_chamber": "Actualization Chamber", - "gtceu.actualization_chamber": "Actualization", - "gtceu.multiblock.actualization_chamber.description": "§7A powerful machine that harnesses the most complex of matters and turns it into raw materials", "block.gtceu.cryococcal_reverberator": "Cryococcal Reverberator", "gtceu.reverberation": "Reverberation", "block.gtceu.atmospheric_accumulator": "Atmospheric Accumulator", diff --git a/kubejs/assets/gtceu/lang/es.json b/kubejs/assets/gtceu/lang/es.json index 7641e21dd..f2a26a90c 100644 --- a/kubejs/assets/gtceu/lang/es.json +++ b/kubejs/assets/gtceu/lang/es.json @@ -121,9 +121,6 @@ "block.gtceu.universal_crystallizer": "Cristalizador Universal", "gtceu.universal_crystallizer": "Crystalización", "gtceu.multiblock.universal_crystallizer.description": "§7Un aparato inmenso, capaz de convertir los materiales crudos en temas complejos.", - "block.gtceu.actualization_chamber": "Cámara de Realización", - "gtceu.actualization_chamber": "Realización", - "gtceu.multiblock.actualization_chamber.description": "§7Una máquina poderosa que aprovecha las más complejas de materias y las transforma en materia prima", "block.gtceu.cryococcal_reverberator": "Reverberador Criococal", "gtceu.reverberation": "Reverberación", "block.gtceu.atmospheric_accumulator": "Acumulador Átmosferico", diff --git a/kubejs/assets/gtceu/lang/fr.json b/kubejs/assets/gtceu/lang/fr.json index 6fc408970..c1b0e118c 100644 --- a/kubejs/assets/gtceu/lang/fr.json +++ b/kubejs/assets/gtceu/lang/fr.json @@ -121,9 +121,6 @@ "block.gtceu.universal_crystallizer": "", "gtceu.universal_crystallizer": "", "gtceu.multiblock.universal_crystallizer.description": "", - "block.gtceu.actualization_chamber": "", - "gtceu.actualization_chamber": "", - "gtceu.multiblock.actualization_chamber.description": "", "block.gtceu.cryococcal_reverberator": "", "gtceu.reverberation": "", "block.gtceu.atmospheric_accumulator": "", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index a5580256e..69488baa8 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -121,9 +121,6 @@ "block.gtceu.universal_crystallizer": "ユニバーサルクリスタライザー", "gtceu.universal_crystallizer": "結晶化", "gtceu.multiblock.universal_crystallizer.description": "§7原材料を複雑な物質に変えることができる巨大な装置。", - "block.gtceu.actualization_chamber": "アクチュアリゼーションチャンバー", - "gtceu.actualization_chamber": "アクチュアリゼーションチャンバー", - "gtceu.multiblock.actualization_chamber.description": "§7最も複雑な物質を利用し、それを原材料に変える強力な機械。", "block.gtceu.cryococcal_reverberator": "クリオコッカスリバーブレーター", "gtceu.reverberation": "リバーブレーション", "block.gtceu.atmospheric_accumulator": "大気アキュムレータ", diff --git a/kubejs/assets/gtceu/lang/pt_br.json b/kubejs/assets/gtceu/lang/pt_br.json index c3a9503c1..d8b6f6269 100644 --- a/kubejs/assets/gtceu/lang/pt_br.json +++ b/kubejs/assets/gtceu/lang/pt_br.json @@ -110,9 +110,6 @@ "block.gtceu.universal_crystallizer": "Cristalizador universal", "gtceu.universal_crystallizer": "Cristalização", "gtceu.multiblock.universal_crystallizer.description": "§7Um dispositivo enorme, capaz de transformar materiais brutos em matéria complexa.", - "block.gtceu.actualization_chamber": "Câmara de atualização", - "gtceu.actualization_chamber": "Atualização", - "gtceu.multiblock.actualization_chamber.description": "§7Uma máquina poderosa que aproveita ao máximo materiais complexos e os transforma em materiais brutos", "block.gtceu.cryococcal_reverberator": "Reverberador criococcal", "gtceu.reverberation": "Reverberação", "block.gtceu.atmospheric_accumulator": "Acumulador atmosférico", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 6bab43463..6bf42483b 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -1,5 +1,4 @@ { - "block.gtceu.actualization_chamber": "Камера актуализации", "block.gtceu.advanced_microverse_projector": "Продвинутый проектор микровселенной", "block.gtceu.advanced_microverse_projector_ii": "Продвинутый проектор микровселенной II", "block.gtceu.atmospheric_accumulator": "Атмосферный накопитель", @@ -33,7 +32,6 @@ "block.gtceu.universal_crystallizer": "Универсальный кристаллизатор", "block.gtceu.uv_atomic_reconstructor": "§3Пиковый атомный реконструктор", "block.gtceu.zpm_atomic_reconstructor": "§cЭлитный атомный реконструктор III", - "gtceu.actualization_chamber": "Актуализация", "gtceu.advanced_microverse": "Продвинутый проектор микровселенной", "gtceu.advanced_microverse_ii": "Продвинутый проектор микровселенной II", "gtceu.advanced_microverse_iii": "Продвинутый проектор микровселенной III", @@ -276,7 +274,6 @@ "gtceu.multiblock.quintessence_infuser.description": "§77Использует интенсивные скорости вращения для наполнения большого количества душ в объекты за раз.", "gtceu.multiblock.rock_cycle_simulator.description": "§7Мощный механизм, который может производить и собирать сотни кубометров вулканических пород в секунду.", "gtceu.multiblock.universal_crystallizer.description": "§7Огромное устройство, способное превращать сырые материалы в сложные вещества.", - "gtceu.multiblock.actualization_chamber.description": "§7Мощный механизм, собирающий самые сложные материалы и превращает их в сырьё", "block.gtceu.cryococcal_reverberator": "Криококкальный ревербератор", "gtceu.multiblock.helical_fusion_reactor.description": "§7Спиральный ядерный реактор это очень большая многоблочная структура, используемая для параллельного синтеза элементов в более тяжёлые. Для каждого люка его буфер увеличивается на 80М EU и имеет лимит в 1280 млн.", "material.gtceu.waste_gas_mixture": "Смесь отработанных газов", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 90d586cee..eb41c4ace 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -109,9 +109,6 @@ "block.gtceu.universal_crystallizer": "通用结晶器", "gtceu.universal_crystallizer": "结晶化", "gtceu.multiblock.universal_crystallizer.description": "§7能够将原材料转化为复杂物质的庞大设备。", - "block.gtceu.actualization_chamber": "实体化仓", - "gtceu.actualization_chamber": "实体化", - "gtceu.multiblock.actualization_chamber.description": "§7能将最复杂的物质转化为其原材料的强大机器", "block.gtceu.cryococcal_reverberator": "寒珠震荡器", "gtceu.reverberation": "震荡", "block.gtceu.atmospheric_accumulator": "大气积累器", diff --git a/kubejs/assets/kubejs/lang/de.json b/kubejs/assets/kubejs/lang/de.json index 9ca7cfc5a..b5407519e 100644 --- a/kubejs/assets/kubejs/lang/de.json +++ b/kubejs/assets/kubejs/lang/de.json @@ -53,17 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "", "item.kubejs.stabilized_microminer.tooltip.2": "", "item.kubejs.stabilized_microminer.tooltip.3": "", - "item.kubejs.pristine_matter_t1": "", - "item.kubejs.pristine_matter_t2": "", - "item.kubejs.pristine_matter_t3": "", - "item.kubejs.pristine_matter_t4": "", - "item.kubejs.pristine_matter_t4half": "", - "item.kubejs.pristine_matter_t5": "", - "item.kubejs.pristine_matter_t6": "", - "item.kubejs.pristine_matter_t7": "", - "item.kubejs.pristine_matter_t8": "", - "item.kubejs.pristine_matter_t8half": "", - "item.kubejs.pristine_matter.desc": "", "item.kubejs.pulsating_dust": "", "item.kubejs.pulsating_mesh": "", "item.kubejs.warden_horn": "", diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index 806eb66ad..2a16a6e20 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -61,19 +61,6 @@ "item.kubejs.stabilized_microminer.tooltip.2": "§7§oLasts indefinitely. Reusable. Totally not overpowered.", "item.kubejs.stabilized_microminer.tooltip.3": "§7§oIt looks oddly familiar.", - "item.kubejs.pristine_matter_t1": "§dPristine Steel Microverse Matter [Tier One]", - "item.kubejs.pristine_matter_t2": "§dPristine Titanium Microverse Matter [Tier Two]", - "item.kubejs.pristine_matter_t3": "§dPristine Tungsten Microverse Matter [Tier Three]", - "item.kubejs.pristine_matter_t4": "§dPristine Signalum Microverse Matter [Tier Four]", - "item.kubejs.pristine_matter_t4half": "§dPristine Lumium Microverse Matter [Tier Four and a Half]", - "item.kubejs.pristine_matter_t5": "§dPristine Iridium Microverse Matter [Tier Five]", - "item.kubejs.pristine_matter_t6": "§dPristine Enderium Microverse Matter [Tier Six]", - "item.kubejs.pristine_matter_t7": "§dPristine Cryobulus Microverse Matter [Tier Seven]", - "item.kubejs.pristine_matter_t8": "§dPristine Crystal Microverse Matter [Tier Eight]", - "item.kubejs.pristine_matter_t8half": "§dPristine Trinium Microverse Matter [Tier Eight and a Half]", - - "item.kubejs.pristine_matter.desc": "§7§oAn infinite and incomprehensible abyss of materials.", - "item.kubejs.pulsating_dust": "Pulsating Dust", "item.kubejs.pulsating_mesh": "Pulsating Mesh", "item.kubejs.warden_horn": "Warden Tendril", diff --git a/kubejs/assets/kubejs/lang/es.json b/kubejs/assets/kubejs/lang/es.json index cef8f7999..e22c91378 100644 --- a/kubejs/assets/kubejs/lang/es.json +++ b/kubejs/assets/kubejs/lang/es.json @@ -53,17 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "", "item.kubejs.stabilized_microminer.tooltip.2": "", "item.kubejs.stabilized_microminer.tooltip.3": "", - "item.kubejs.pristine_matter_t1": "", - "item.kubejs.pristine_matter_t2": "", - "item.kubejs.pristine_matter_t3": "", - "item.kubejs.pristine_matter_t4": "", - "item.kubejs.pristine_matter_t4half": "", - "item.kubejs.pristine_matter_t5": "", - "item.kubejs.pristine_matter_t6": "", - "item.kubejs.pristine_matter_t7": "", - "item.kubejs.pristine_matter_t8": "", - "item.kubejs.pristine_matter_t8half": "", - "item.kubejs.pristine_matter.desc": "", "item.kubejs.pulsating_dust": "", "item.kubejs.pulsating_mesh": "", "item.kubejs.warden_horn": "", diff --git a/kubejs/assets/kubejs/lang/fr.json b/kubejs/assets/kubejs/lang/fr.json index 9ca7cfc5a..b5407519e 100644 --- a/kubejs/assets/kubejs/lang/fr.json +++ b/kubejs/assets/kubejs/lang/fr.json @@ -53,17 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "", "item.kubejs.stabilized_microminer.tooltip.2": "", "item.kubejs.stabilized_microminer.tooltip.3": "", - "item.kubejs.pristine_matter_t1": "", - "item.kubejs.pristine_matter_t2": "", - "item.kubejs.pristine_matter_t3": "", - "item.kubejs.pristine_matter_t4": "", - "item.kubejs.pristine_matter_t4half": "", - "item.kubejs.pristine_matter_t5": "", - "item.kubejs.pristine_matter_t6": "", - "item.kubejs.pristine_matter_t7": "", - "item.kubejs.pristine_matter_t8": "", - "item.kubejs.pristine_matter_t8half": "", - "item.kubejs.pristine_matter.desc": "", "item.kubejs.pulsating_dust": "", "item.kubejs.pulsating_mesh": "", "item.kubejs.warden_horn": "", diff --git a/kubejs/assets/kubejs/lang/ja_jp.json b/kubejs/assets/kubejs/lang/ja_jp.json index 081e599d9..f9ceb6804 100644 --- a/kubejs/assets/kubejs/lang/ja_jp.json +++ b/kubejs/assets/kubejs/lang/ja_jp.json @@ -52,17 +52,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "§7§o大宇宙の心臓が注入され、安定化したもの", "item.kubejs.stabilized_microminer.tooltip.2": "§7§o永久不滅。再利用可能。強力すぎることはありません。", "item.kubejs.stabilized_microminer.tooltip.3": "§7§oなぜか見覚えがあるように見える。", - "item.kubejs.pristine_matter_t1": "§d原始的なスチール製マイクロバースマター [Tier 1]", - "item.kubejs.pristine_matter_t2": "§d原始的なチタン製マイクロバースマター [Tier 2]", - "item.kubejs.pristine_matter_t3": "§d原始的なタングステン製マイクロバースマター [Tier 3]", - "item.kubejs.pristine_matter_t4": "§d原始的なシグナルム製マイクロバースマター [Tier 4]", - "item.kubejs.pristine_matter_t4half": "§d原始的なルミウム製マイクロバースマター [Tier 4.5]", - "item.kubejs.pristine_matter_t5": "§d原始的なイリジウム製マイクロバースマター [Tier 5]", - "item.kubejs.pristine_matter_t6": "§d原始的なエンダリウム製マイクロバースマター [Tier 6]", - "item.kubejs.pristine_matter_t7": "§d原始的なクリオロバス製マイクロバースマター [Tier 7]", - "item.kubejs.pristine_matter_t8": "§d原始的なクリスタル製マイクロバースマター [Tier 8]", - "item.kubejs.pristine_matter_t8half": "§d原始的なトリニウム製マイクロバースマター [Tier 8.5]", - "item.kubejs.pristine_matter.desc": "§7§o終わりのない、理解のできない、深淵の物質。", "item.kubejs.pulsating_dust": "脈動する粉末", "item.kubejs.pulsating_mesh": "脈動メッシュ", "item.kubejs.warden_horn": "ウォーデンの巻きひげ", diff --git a/kubejs/assets/kubejs/lang/pt_br.json b/kubejs/assets/kubejs/lang/pt_br.json index 983fc713a..819999ea4 100644 --- a/kubejs/assets/kubejs/lang/pt_br.json +++ b/kubejs/assets/kubejs/lang/pt_br.json @@ -53,17 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "§7§oUma versão estabilizada, injetada com um Coração de um universo.", "item.kubejs.stabilized_microminer.tooltip.2": "§7§oDura indefinidamente. Reusável. Nem um pouco op.", "item.kubejs.stabilized_microminer.tooltip.3": "§7§oIsto é muito familiar.", - "item.kubejs.pristine_matter_t1": "§dMatéria do microverso de aço imaculado [Nível Um]", - "item.kubejs.pristine_matter_t2": "§dMatéria do microverso de titânio imaculado [Nível Dois]", - "item.kubejs.pristine_matter_t3": "§dMatéria do microverso de tungstênio imaculado [Nível Três]", - "item.kubejs.pristine_matter_t4": "§dMatéria do microverso de signálio imaculado [Nível Quatro]", - "item.kubejs.pristine_matter_t4half": "§dMatéria do microverso de lúmio imaculado [Nível Quatro e Meio]", - "item.kubejs.pristine_matter_t5": "§dMatéria do microverso de irídio imaculado [Nível Cinco]", - "item.kubejs.pristine_matter_t6": "§dMatéria do microverso de endério imaculado [Nível Seis]", - "item.kubejs.pristine_matter_t7": "§dMatéria do microverso de cryobulus imaculado [Nível Sete]", - "item.kubejs.pristine_matter_t8": "§dMatéria do microverso de cristal imaculado [Nível Oito]", - "item.kubejs.pristine_matter_t8half": "§dMatéria do microverso de trínio imaculado [Nível Oito e Meio]", - "item.kubejs.pristine_matter.desc": "§7§oUm abismo infinito e incompreensível de materiais.", "item.kubejs.pulsating_dust": "Pó pulsante", "item.kubejs.pulsating_mesh": "Malha pulsante", "item.kubejs.warden_horn": "Gavinha de defensor", diff --git a/kubejs/assets/kubejs/lang/ru_ru.json b/kubejs/assets/kubejs/lang/ru_ru.json index d659dc436..84c8e0d1b 100644 --- a/kubejs/assets/kubejs/lang/ru_ru.json +++ b/kubejs/assets/kubejs/lang/ru_ru.json @@ -31,16 +31,6 @@ "item.kubejs.moni_nickel": "§eМониникель §r§7[5]", "item.kubejs.moni_penny": "Монипенни §7[1]", "item.kubejs.moni_quarter": "§bМониквотер §r§7[25]", - "item.kubejs.pristine_matter_t1": "§dИдеальная стальная микровселенская материя [Уровень 1]", - "item.kubejs.pristine_matter_t2": "§dИдеальная титановая микровселенская материя [Уровень 2]", - "item.kubejs.pristine_matter_t3": "§dИдеальная вольфрамовая микровселенская материя [Уровень 3]", - "item.kubejs.pristine_matter_t4": "§dИдеальная сигналиевая микровселенская материя [Уровень 4]", - "item.kubejs.pristine_matter_t4half": "§dИдеальная люмиевая микровселенская материя [Уровень 4.5]", - "item.kubejs.pristine_matter_t5": "§dИдеальная иридиевая микровселенская материя [Уровень 5]", - "item.kubejs.pristine_matter_t6": "§dИдеальная эндериевая микровселенская материя [Уровень 6]", - "item.kubejs.pristine_matter_t7": "§dИдеальная скалковая микровселенская материя [Уровень 7]", - "item.kubejs.pristine_matter_t8": "§dИдеальная кристаллическая микровселенская материя [Уровень 8]", - "item.kubejs.pristine_matter_t8half": "§dИдеальная триниевая микровселенская материя [Уровень 8.5]", "item.kubejs.smore_1": "См-литок смора", "item.kubejs.smore_16": "См-а см-естнадцать см-ольше гексадека-см-литков", "item.kubejs.smore_2": "См-этот и см-ещё см-один дабл-см-литок", @@ -63,7 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "§7§oСтабилизированная версия, слитая с Сердцем Вселенной.", "item.kubejs.stabilized_microminer.tooltip.2": "§7§oВечная. Многоразовая. Точно не имба.", "item.kubejs.stabilized_microminer.tooltip.3": "§7§oОна на что-то похожа.", - "item.kubejs.pristine_matter.desc": "§7§oБесконечная и непостижимая пучина материалов.", "item.kubejs.pulsating_dust": "Пульсирущая Кучка", "item.kubejs.pulsating_mesh": "Пульсирующая Сетка", "item.kubejs.mesol_core": "Ядро Мезола", diff --git a/kubejs/assets/kubejs/lang/zh_cn.json b/kubejs/assets/kubejs/lang/zh_cn.json index ad1b1f598..a65187bd1 100644 --- a/kubejs/assets/kubejs/lang/zh_cn.json +++ b/kubejs/assets/kubejs/lang/zh_cn.json @@ -53,17 +53,6 @@ "item.kubejs.stabilized_microminer.tooltip.1": "§7§o注入了宇宙之心的一种稳定版本。", "item.kubejs.stabilized_microminer.tooltip.2": "§7§o永恒、不灭，实力深不可测。", "item.kubejs.stabilized_microminer.tooltip.3": "§7§o有种莫名的熟悉感。", - "item.kubejs.pristine_matter_t1": "§d完美的钢质微观宇宙物质 [一级]", - "item.kubejs.pristine_matter_t2": "§d完美的钛质微观宇宙物质 [二级]", - "item.kubejs.pristine_matter_t3": "§d完美的钨质微观宇宙物质 [三级]", - "item.kubejs.pristine_matter_t4": "§d完美的信素微观宇宙物质 [四级]", - "item.kubejs.pristine_matter_t4half": "§d完美的流明微观宇宙物质 [四级改]", - "item.kubejs.pristine_matter_t5": "§d完美的铱质微观宇宙物质 [五级]", - "item.kubejs.pristine_matter_t6": "§d完美的末影微观宇宙物质 [六级]", - "item.kubejs.pristine_matter_t7": "§d完美的寒触微观宇宙物质 [七级]", - "item.kubejs.pristine_matter_t8": "§d完美的水晶微观宇宙物质 [八级]", - "item.kubejs.pristine_matter_t8half": "§d完美的三元金属微观宇宙物质 [八级改]", - "item.kubejs.pristine_matter.desc": "§7§o无尽且不可理解的材料深渊。", "item.kubejs.pulsating_dust": "脉动之尘", "item.kubejs.pulsating_mesh": "脉动筛网", "item.kubejs.warden_horn": "监守者触须", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index fa1546649..8f0aa3bac 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -23,10 +23,6 @@ ItemEvents.tooltip(tooltip => { text.add(3, Text.translatable('item.kubejs.stabilized_microminer.tooltip.3')) }) - tooltip.addAdvanced(['/kubejs:pristine_matter/'], (item, adv, text) => { - text.add(1, Text.translatable('item.kubejs.pristine_matter.desc')) - }) - // Microminer Components tooltip.add('kubejs:universal_navigator', Text.translatable('kubejs.universal_navigator.tooltip')) @@ -47,7 +43,7 @@ ItemEvents.tooltip(tooltip => { // Questbook tooltip.addAdvanced(`ftbquests:book`, (item, adv, text) => { text.add(2, Text.gray(Text.translatable('ftbquests.book.tooltip'))) }) - // Redstone Clock + // Redstone Clock tooltip.add('redstoneclock:redstone_clock', Text.translatable('redstoneclock.redstone_clock.tooltip')) // DML Data Model @@ -103,7 +99,6 @@ ItemEvents.tooltip(tooltip => { tooltip.add('gtceu:advanced_microverse_projector', Text.translatable('gtceu.multiblock.advanced_microverse_projector.description')) tooltip.add('gtceu:advanced_microverse_projector_ii', Text.translatable('gtceu.multiblock.advanced_microverse_projector_ii.description')) tooltip.add('gtceu:subatomic_digital_assembler', Text.translatable('gtceu.multiblock.subatomic_digital_assembler.description')) - tooltip.add('gtceu:actualization_chamber', Text.translatable('gtceu.multiblock.actualization_chamber.description')) tooltip.add('gtceu:large_naquadah_reactor', Text.translatable('gtceu.multiblock.large_naquadah_reactor.description')) tooltip.add('gtceu:naquadah_refinery', Text.translatable('gtceu.multiblock.naquadah_refinery.description')) @@ -269,7 +264,7 @@ ItemEvents.tooltip(tooltip => { 'packagedexcrafting:ultimate_crafter', 'packagedexexcrafting:epic_crafter' ], Text.translatable("packagedexcrafting.crafterspeed.tooltip")) - + // Tempad if (Platform.isLoaded('tempad')) { tooltip.add('tempad:tempad', Text.translatable("tempad.tempad.tooltip")) diff --git a/kubejs/server_scripts/microverse/mission_utils.js b/kubejs/server_scripts/microverse/mission_utils.js index 264f41f72..56d7cdc9f 100644 --- a/kubejs/server_scripts/microverse/mission_utils.js +++ b/kubejs/server_scripts/microverse/mission_utils.js @@ -1,7 +1,6 @@ //priority: 1 /** * Utility functions for registering microminer missions, - * actualization chamber counterparts, * and lower-tier projector missions more succinctly. */ @@ -25,7 +24,7 @@ global.mission_counts = { } /** - * Registers a basic microverse mission and equivalent actualization chamber recipe + * Registers a basic microverse mission and equivalent stabilized mission recipe * @param {Internal.RecipesEventJS} event Parameter used in consumer for ServerEvents.recipes(). * @param {number} minerTier Miner tier index. Typically 1 through 12. * @param {number} duration Recipe duration in seconds @@ -56,12 +55,13 @@ function microverse_mission(event, minerTier, projectorTier, duration, voltageAr .EUt(voltageArray[voltageTier]) ); - //Register actualization chamber counterparts in Hard Mode and Expert Mode except for T9+ - if(isHardMode && minerTier < 9) { + + //Register stabilized counterparts in Hard Mode and Expert Mode except for T9+ + if(isHardMode && minerTier < 9 || (typeof minerTier === "string" && minerTier.replace("half", "") < 9)) { builders.push( - event.recipes.gtceu.actualization_chamber(`kubejs:pristine_t${minerTier}_${global.mission_counts[minerTier]}`) - .itemInputs(`kubejs:pristine_matter_t${minerTier}`) - .circuit(global.mission_counts[minerTier]) + event.recipes.gtceu.microverse(`kubejs:mission_t${minerTier}_${global.mission_counts[minerTier]}_stabalized`) + .addData("projector_tier", projectorTier) + .notConsumable(`kubejs:stabilized_microminer_t${minerTier}`) .duration(800) .EUt(GTValues.VA[GTValues.LuV]) ); diff --git a/kubejs/server_scripts/microverse/pristine_matters.js b/kubejs/server_scripts/microverse/pristine_matters.js deleted file mode 100644 index 9e984bd49..000000000 --- a/kubejs/server_scripts/microverse/pristine_matters.js +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Script for generating recipes for pristine matters and stabilized microminers. - */ -ServerEvents.recipes(event => { - if(isNormalMode) return; - - // Pristine Matter & corresponding projector tier - const pristine_matter = [ - ['1', 1], - ['2', 1], - ['2half', 1], - ['3', 1], - ['4', 2], - ['4half', 2], - ['5', 2], - ['6', 2], - ['7', 3], - ['8', 3], - ['8half', 3] - ] - - /** - * Function for making a stabilized miner assembly line recipe. - * @param {string} minerTier The tier of miner to generate a stabilized matter recipe for. Typically a string representation of a number. - */ - function stabilized_miner_recipe(minerTier) { - event.recipes.gtceu.assembly_line(`stable_t_${minerTier}`) - .itemInputs(`kubejs:microminer_t${minerTier}`, 'kubejs:heart_of_a_universe', '4x kubejs:hadal_shard', '24x gtceu:uv_field_generator', '7x gtceu:dense_iridium_plate', '7x gtceu:dense_iridium_plate', '7x gtceu:dense_iridium_plate', '7x gtceu:dense_iridium_plate') - .inputFluids('gtceu:rocket_fuel 40800', 'gtceu:omnium 576', 'gtceu:neutronium 576') - .itemOutputs(`kubejs:stabilized_microminer_t${minerTier}`) - .duration(120) - .EUt(GTValues.VA[GTValues.UHV]) - } - - /** - * Function for making a pristine matter recipe - * @param {string} minerTier - * @param {number} projectorTier - */ - function pristine_matter_recipe(minerTier, projectorTier) { - event.recipes.gtceu.microverse(`pristine_${minerTier}`) - .addData("Microverse_Tier", projectorTier) - .notConsumable(`kubejs:stabilized_microminer_t${minerTier}`) - .itemOutputs(`kubejs:pristine_matter_t${minerTier}`) - .duration(470.4 * 20) - .EUt(GTValues.VA[GTValues.LuV]) - } - - // Apply recipe generation functions to each pristine matter tier - pristine_matter.forEach(([minerTier, projectorTier]) => { - pristine_matter_recipe(minerTier, projectorTier); - stabilized_miner_recipe(minerTier); - }); -}) diff --git a/kubejs/server_scripts/microverse/projectors.js b/kubejs/server_scripts/microverse/projectors.js index abb56274f..b74bec22d 100644 --- a/kubejs/server_scripts/microverse/projectors.js +++ b/kubejs/server_scripts/microverse/projectors.js @@ -63,21 +63,4 @@ ServerEvents.recipes(event => { A: '#gtceu:circuits/uev', R: 'gtceu:computer_monitor_cover' }).id('kubejs:shaped/hyperbolic_microverse_projector') - - if(isHardMode) { - event.recipes.extendedcrafting.shaped_table('gtceu:actualization_chamber', [ - 'PPPPP', - 'PEBSP', - 'PCFCP', - 'PSBEP', - 'PPPPP' - ], { - P: 'gtceu:americium_plate', - E: 'gtceu:uv_emitter', - B: 'gtceu:fusion_coil', - S: 'gtceu:uv_sensor', - F: 'gtceu:uv_field_generator', - C: '#gtceu:circuits/uv' - }) - } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/microverse/stabilized_miners.js b/kubejs/server_scripts/microverse/stabilized_miners.js new file mode 100644 index 000000000..f5cdc580c --- /dev/null +++ b/kubejs/server_scripts/microverse/stabilized_miners.js @@ -0,0 +1,37 @@ +/** + * Script for generating recipes for stabilized microminers. + */ +ServerEvents.recipes(event => { + if(isNormalMode) return; + + const stabilized_miners = [ + '1', + '2', + '2half', + '3', + '4', + '4half', + '5', + '6', + '7', + '8', + '8half' + ] + + /** + * Function for making a stabilized miner assembly line recipe. + * @param {string} minerTier The tier of miner to generate a stabilized matter recipe for. Typically a string representation of a number. + */ + function stabilized_miner_recipe(minerTier) { + event.recipes.gtceu.assembly_line(`stable_t_${minerTier}`) + .itemInputs(`kubejs:microminer_t${minerTier}`, 'kubejs:heart_of_a_universe', '2x kubejs:hadal_shard', '8x gtceu:uv_field_generator', '7x gtceu:dense_iridium_plate', '7x gtceu:dense_iridium_plate') + .inputFluids('gtceu:rocket_fuel 40800', 'gtceu:omnium 576', 'gtceu:neutronium 576') + .itemOutputs(`kubejs:stabilized_microminer_t${minerTier}`) + .duration(120) + .EUt(GTValues.VA[GTValues.UHV]) + } + + stabilized_miners.forEach((minerTier) => { + stabilized_miner_recipe(minerTier); + }); +}) diff --git a/kubejs/startup_scripts/registry/item_registry.js b/kubejs/startup_scripts/registry/item_registry.js index b0343751b..103af01e9 100644 --- a/kubejs/startup_scripts/registry/item_registry.js +++ b/kubejs/startup_scripts/registry/item_registry.js @@ -15,35 +15,25 @@ StartupEvents.registry('item', event => { event.create('microminer_t2half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t2half") event.create('microminer_t4half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t4half") event.create('microminer_t8half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t8half") - } - - - // Pristine Matters - const pristine_matter = [ - ['1', '#c0c0b0'], - ['2', '#f5f5f1'], - ['2half', '#414751'], - ['3', '#635480'], - ['4', '#f17d3d'], - ['4half', '#eef487'], - ['5', '#fccc6a'], - ['6', '#58a14e'], - ['7', '#173639'], - ['8', '#dcdbe4'], - ['8half', '#4ebcef'] - ] - if (!isNormalMode) { - for (const [tier, color] of pristine_matter) { + // Stabilized Miners + for (const tier of [ + '1', + '2', + '2half', + '3', + '4', + '4half', + '5', + '6', + '7', + '8', + '8half', + ]) { event.create(`stabilized_microminer_t${tier}`) .maxStackSize(16) .texture(`kubejs:item/microverse/microminer_t${tier}`) .glow(true); - event.create(`pristine_matter_t${tier}`) - .textureJson({ layer0: 'kubejs:item/prediction' }) - .color(0, color) - .glow(true); - } } diff --git a/kubejs/startup_scripts/registry/multiblock_registry.js b/kubejs/startup_scripts/registry/multiblock_registry.js index 525808952..153e72b5c 100644 --- a/kubejs/startup_scripts/registry/multiblock_registry.js +++ b/kubejs/startup_scripts/registry/multiblock_registry.js @@ -33,15 +33,6 @@ GTCEuStartupEvents.registry('gtceu:recipe_type', event => { // Hard mode-exclusive Multis if (!isNormalMode) { - // Actualization Chamber - event.create('actualization_chamber') - .category('multiblock') - .setEUIO('in') - .setMaxIOSize(2, 12, 0, 0) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.COOLING) - // Universal Crystallizer event.create('universal_crystallizer') .category('multiblock') @@ -223,26 +214,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { // Expert mode-exclusive multis if (isHardMode) { - // Actualization Chamber - event.create('actualization_chamber', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeTypes('actualization_chamber') - .recipeModifiers([GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK)]) - .appearanceBlock(GTBlocks.FUSION_CASING) - .pattern(definition => FactoryBlockPattern.start() - .aisle("XXX", "GGG", "XXX") - .aisle("XXX", "GOG", "XXX") - .aisle("X@X", "GGG", "XXX") - .where("@", Predicates.controller(Predicates.blocks(definition.get()))) - .where('X', Predicates.blocks(GTBlocks.FUSION_CASING.get()).setMinGlobalLimited(9) - .or(Predicates.autoAbilities(definition.getRecipeTypes())) - .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) - .where('G', Predicates.blocks(GTBlocks.FUSION_GLASS.get())) - .where('O', Predicates.blocks(GTBlocks.FUSION_COIL.get())) - .build()) - .workableCasingRenderer("gtceu:block/casings/fusion/fusion_casing", - "gtceu:block/multiblock/implosion_compressor", false) - // Universal Crystallizer event.create('universal_crystallizer', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) @@ -550,7 +521,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { "gtceu:block/machines/electrolyzer", false) let getMicroverseRecipeModifiers = tier => [ - GTRecipeModifiers.OC_NON_PERFECT, + GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => recipe.data.getLong('projector_tier') > tier? ModifierFunction.NULL : ModifierFunction.IDENTITY ]