From 50c397081c3f263d472099f1f82f9dba82316e41 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 10 Sep 2023 15:19:44 +0900 Subject: [PATCH 1/2] [specific] Move GrS --- README.md | 11 +- overrides/groovy/assets/gte2/lang/en_us.lang | 0 .../groovy/postInit/specific/AE2Sutff.groovy | 36 +++++ .../specific/CapabilityAdapter.groovy | 22 +++ .../postInit/specific/CompactMachines.groovy | 121 ++++++++++++++++ .../postInit/specific/FluxNetworks.groovy | 89 ++++++++++++ .../postInit/specific/SpiceOfLife.groovy | 29 ++++ overrides/groovy/runConfig.json | 17 +++ overrides/scripts/specific/AE2Sutff.zs | 33 ----- .../scripts/specific/CapabilityAdapter.zs | 16 -- overrides/scripts/specific/CompactMachines.zs | 120 --------------- overrides/scripts/specific/ExtraCells.zs | 89 ------------ overrides/scripts/specific/FluxNetworks.zs | 85 ----------- overrides/scripts/specific/SpiceOfLife.zs | 28 ---- overrides/scripts/specific/VolumetricFlask.zs | 137 ------------------ 15 files changed, 315 insertions(+), 518 deletions(-) create mode 100644 overrides/groovy/assets/gte2/lang/en_us.lang create mode 100644 overrides/groovy/postInit/specific/AE2Sutff.groovy create mode 100644 overrides/groovy/postInit/specific/CapabilityAdapter.groovy create mode 100644 overrides/groovy/postInit/specific/CompactMachines.groovy create mode 100644 overrides/groovy/postInit/specific/FluxNetworks.groovy create mode 100644 overrides/groovy/postInit/specific/SpiceOfLife.groovy create mode 100644 overrides/groovy/runConfig.json delete mode 100644 overrides/scripts/specific/AE2Sutff.zs delete mode 100644 overrides/scripts/specific/CapabilityAdapter.zs delete mode 100644 overrides/scripts/specific/CompactMachines.zs delete mode 100644 overrides/scripts/specific/ExtraCells.zs delete mode 100644 overrides/scripts/specific/FluxNetworks.zs delete mode 100644 overrides/scripts/specific/SpiceOfLife.zs delete mode 100644 overrides/scripts/specific/VolumetricFlask.zs diff --git a/README.md b/README.md index b0b82723..8a17e4a9 100644 --- a/README.md +++ b/README.md @@ -43,20 +43,11 @@ - You want to make RF wireless? - [ME Capability Adapter](https://www.curseforge.com/minecraft/mc-mods/capability-adapter) - For those who want to use ME System. - - [Volumetric Flask](https://www.curseforge.com/minecraft/mc-mods/volumetric-flask) - - Migration to AE2 Fluid Crafting Rework. However, a Flask can still be created. - - [ExtraCells2 - SamLam140330's Fork](https://www.curseforge.com/minecraft/mc-mods/extra-cells-2-samlam140330s-fork) - - Migration to AE Additions only. You will not be able to make any ExtraCells2 stuff. - - More other mods support ?? - - If you want to add support for other mods, please contact us on Discord. In some cases, we will formally implement it. ## Bansoukou -- This pack uses three bansoukou patches. The first is [Draconic Additions](https://github.com/FoxMcloud5655/Draconic-Additions/tree/1.12.2), and the third is [EZ Storage](https://github.com/zerofall/EZStorage2). - - [Draconic Additions](https://github.com/GTModpackTeam/Draconic-Additions): Since the recipe cannot be deleted, it was removed directly from the source. - - [Draconic Evolution](https://github.com/Nomi-CEu/Draconic-Evolution): This adds the destruct core button, and allows GT blocks in place of DE blocks, in the Energy Core and Reactor. - - [EZ Storage](https://github.com/zerofall/EZStorage2/pull/69): Captured PR that was up. +- [Draconic Additions](https://github.com/GTModpackTeam/Draconic-Additions): Since the recipe cannot be deleted, it was removed directly from the source. ## Credits diff --git a/overrides/groovy/assets/gte2/lang/en_us.lang b/overrides/groovy/assets/gte2/lang/en_us.lang new file mode 100644 index 00000000..e69de29b diff --git a/overrides/groovy/postInit/specific/AE2Sutff.groovy b/overrides/groovy/postInit/specific/AE2Sutff.groovy new file mode 100644 index 00000000..6f33e00e --- /dev/null +++ b/overrides/groovy/postInit/specific/AE2Sutff.groovy @@ -0,0 +1,36 @@ + + + +if (isLoaded('ae2stuff')) { + /* + * ######################################## + * Blocks + * ######################################## + */ + + // Pattern Encoder + mods.jei.removeAndHide(item('ae2stuff:encoder')) + + // Crystal Growth Chamber + mods.jei.removeAndHide(item('ae2stuff:grower')) + + // Advanced Inscriber + mods.jei.removeAndHide(item('ae2stuff:inscriber')) + + // Wireless Connector + crafting.removeByOutput(item('ae2stuff:wireless')) + mods.gregtech.assembler.recipeBuilder() + .circuitMeta(2) + .inputs( + item('appliedenergistics2:material', 24) * 4, + item('gtexpert:meta_item_1', 1) * 2, + item('appliedenergistics2:material', 41), + item('gregtech:machine_casing', 6) + ) + .fluidInputs(fluid('fluix_alloy') * 1152) + .outputs(item('ae2stuff:wireless')) + .duration(20) + .EUt(30720) + .buildAndRegister() + +} diff --git a/overrides/groovy/postInit/specific/CapabilityAdapter.groovy b/overrides/groovy/postInit/specific/CapabilityAdapter.groovy new file mode 100644 index 00000000..637f38da --- /dev/null +++ b/overrides/groovy/postInit/specific/CapabilityAdapter.groovy @@ -0,0 +1,22 @@ + + + +if (isLoaded('rf-capability-adapter')) { + /* + * ######################################## + * Blocks + * ######################################## + */ + + // Capability Adapter + crafting.removeByOutput(item('rf-capability-adapter:aecapabilityadapter')) + crafting.addShapeless('capability_adapter_from_part', item('rf-capability-adapter:aecapabilityadapter'), [ + item('rf-capability-adapter:aecapabilityadapter_part') + ]) + crafting.addShaped('capability_adapter', item('rf-capability-adapter:aecapabilityadapter'), [ + [metaitem('plateTitanium'), ore('crystalPureFluix'), metaitem('plateTitanium')], + [ore('crystalPureFluix'), ore('craftInterfaceDual'), ore('crystalPureFluix')], + [metaitem('plateTitanium'), ore('crystalPureFluix'), metaitem('plateTitanium')] + ]) + +} diff --git a/overrides/groovy/postInit/specific/CompactMachines.groovy b/overrides/groovy/postInit/specific/CompactMachines.groovy new file mode 100644 index 00000000..32ab4d1a --- /dev/null +++ b/overrides/groovy/postInit/specific/CompactMachines.groovy @@ -0,0 +1,121 @@ + + + +if (isLoaded('compactmachines3')) { + /* + * ######################################## + * Items + * ######################################## + */ + + // Personal Shrinking Device + crafting.removeByOutput(item('compactmachines3:psd')) + crafting.addShaped('personal_shrinking_device', item('compactmachines3:psd'), [ + [null, metaitem('cover.screen'), null], + [metaitem('emitter.mv'), item('minecraft:book'), metaitem('emitter.mv')], + [null, ore('circuitMv'), null] + ]) + + // Tunnel + mods.gregtech.assembler.recipeBuilder() + .inputs([ + metaitem('cover.energy.detector'), + metaitem('cover.item.detector'), + metaitem('cover.fluid.detector') + ]) + .outputs([item('compactmachines3:tunneltool') * 4]) + .duration(100) + .EUt(120) + .buildAndRegister() + + // Redstone Tunnel + mods.gregtech.assembler.recipeBuilder() + .inputs([ + metaitem('cover.activity.detector'), + metaitem('component.resistor') + ]) + .outputs([item('compactmachines3:redstonetunneltool') * 4]) + .duration(100) + .EUt(120) + .buildAndRegister() + + /* + * ######################################## + * Blocks + * ######################################## + */ + + // Compact Machine Wall + crafting.addShaped('compact_machine_wall', item('compactmachines3:wallbreakable') * 8, [ + [metaitem('frameSteel'), metaitem('frameSteel'), metaitem('frameSteel')], + [metaitem('frameSteel'), metaitem('sensor.mv'), metaitem('frameSteel')], + [metaitem('frameSteel'), metaitem('frameSteel'), metaitem('frameSteel')] + ]) + + // Tiny Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 8, + metaitem('field.generator.mv') + ]) + .outputs([item('compactmachines3:machine')]) + .duration(200) + .EUt(120) + .buildAndRegister() + + // Small Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 16, + metaitem('field.generator.hv') + ]) + .outputs([item('compactmachines3:machine', 1)]) + .duration(200) + .EUt(480) + .buildAndRegister() + + // Normal Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 24, + metaitem('field.generator.ev') + ]) + .outputs([item('compactmachines3:machine', 2)]) + .duration(200) + .EUt(1920) + .buildAndRegister() + + // Large Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 32, + metaitem('field.generator.iv') + ]) + .outputs([item('compactmachines3:machine', 3)]) + .duration(200) + .EUt(7680) + .buildAndRegister() + + // Giant Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 40, + metaitem('field.generator.luv') + ]) + .outputs([item('compactmachines3:machine', 4)]) + .duration(200) + .EUt(30720) + .buildAndRegister() + + // Maximum Compact Machine + mods.gregtech.assembler.recipeBuilder() + .inputs([ + item('compactmachines3:wallbreakable') * 48, + metaitem('field.generator.zpm') + ]) + .outputs([item('compactmachines3:machine', 5)]) + .duration(200) + .EUt(122880) + .buildAndRegister() + +} diff --git a/overrides/groovy/postInit/specific/FluxNetworks.groovy b/overrides/groovy/postInit/specific/FluxNetworks.groovy new file mode 100644 index 00000000..90a0ce08 --- /dev/null +++ b/overrides/groovy/postInit/specific/FluxNetworks.groovy @@ -0,0 +1,89 @@ + + + +if (isLoaded('fluxnetworks')) { + /* + * ######################################## + * Items + * ######################################## + */ + + // Flux + mods.jei.removeAndHide(item('fluxnetworks:flux')) + + // Flux Core + mods.jei.removeAndHide(item('fluxnetworks:fluxcore')) + + // Flux Configurator + crafting.removeByOutput(item('fluxnetworks:fluxconfigurator')) + crafting.addShaped('flux_configurator', item('fluxnetworks:fluxconfigurator'), [ + [null, item('appliedenergistics2:material', 45), metaitem('quantumeye')], + [null, metaitem('stickDarkSteel'), item('appliedenergistics2:material', 45)], + [metaitem('stickDarkSteel'), null, null] + ]) + + + /* + * ######################################## + * Blocks + * ######################################## + */ + + // Flux Block + mods.jei.removeAndHide(item('fluxnetworks:fluxblock')) + + // Flux Plug + crafting.removeByOutput(item('fluxnetworks:fluxplug')) + mods.gregtech.assembler.recipeBuilder() + .circuitMeta(2) + .inputs([ + metaitem('emitter.ev') * 2, + metaitem('sensor.ev') * 2, + metaitem('cover.digital.wireless'), + item('appliedenergistics2:smooth_sky_stone_block') + ]) + .outputs([item('fluxnetworks:fluxplug')]) + .duration(2000) + .EUt(1920) + .buildAndRegister() + + // Flux Point + crafting.removeByOutput(item('fluxnetworks:fluxpoint')) + mods.gregtech.assembler.recipeBuilder() + .circuitMeta(6) + .inputs([ + metaitem('emitter.ev') * 2, + metaitem('sensor.ev') * 2, + metaitem('cover.digital.wireless'), + item('appliedenergistics2:smooth_sky_stone_block') + ]) + .outputs([item('fluxnetworks:fluxpoint')]) + .duration(2000) + .EUt(1920) + .buildAndRegister() + + // Flux Controller + crafting.removeByOutput(item('fluxnetworks:fluxcontroller')) + mods.gregtech.assembler.recipeBuilder() + .circuitMeta(8) + .inputs([ + metaitem('emitter.ev') * 2, + metaitem('sensor.ev') * 2, + metaitem('cover.digital.wireless') * 4, + item('gregtech:transparent_casing:2') * 4, + item('appliedenergistics2:smooth_sky_stone_block') + ]) + .outputs([item('fluxnetworks:fluxcontroller')]) + .duration(2000) + .EUt(1920) + .buildAndRegister() + + // Flux Storage + mods.jei.removeAndHide(item('fluxnetworks:fluxstorage')) + + // Herculean Flux Storage + mods.jei.removeAndHide(item('fluxnetworks:herculeanfluxstorage')) + + // Gargantuan Flux Storage + mods.jei.removeAndHide(item('fluxnetworks:gargantuanfluxstorage')) +} diff --git a/overrides/groovy/postInit/specific/SpiceOfLife.groovy b/overrides/groovy/postInit/specific/SpiceOfLife.groovy new file mode 100644 index 00000000..760ba471 --- /dev/null +++ b/overrides/groovy/postInit/specific/SpiceOfLife.groovy @@ -0,0 +1,29 @@ + + + +if (isLoaded('spiceoflife')) { + /* + * ######################################## + * Items + * ######################################## + */ + + // Food Journal + crafting.removeByOutput(item('spiceoflife:bookfoodjournal')) + crafting.addShapeless('book_food_journal', item('spiceoflife:bookfoodjournal'), [item('minecraft:book'), item('minecraft:wheat')]) + + // Lunchbag + crafting.removeByOutput(item('spiceoflife:lunchbag')) + crafting.addShaped('lunch_bag', item('spiceoflife:lunchbag'), [ + [item('minecraft:paper'), null, item('minecraft:paper')], + [metaitem('rubber_drop'), item('minecraft:paper'), metaitem('rubber_drop')] + ]) + + // Lunchbox + crafting.removeByOutput(item('spiceoflife:lunchbox')) + crafting.addShaped('lunch_box', item('spiceoflife:lunchbox'), [ + [metaitem('plateDoubleIron'), ore('craftingToolScrewdriver'), metaitem('plateDoubleIron')], + [metaitem('screwIron'), metaitem('plateDoubleIron'), metaitem('screwIron')] + ]) + +} diff --git a/overrides/groovy/runConfig.json b/overrides/groovy/runConfig.json new file mode 100644 index 00000000..1a1c602a --- /dev/null +++ b/overrides/groovy/runConfig.json @@ -0,0 +1,17 @@ +{ + "packName": "GroovyScript", + "packId": "gte2", + "version": "1.0.0", + "debug": false, + "classes": { + "preInit": [] + }, + "loaders": { + "preInit": [ + "preInit/" + ], + "postInit": [ + "postInit/" + ] + } +} diff --git a/overrides/scripts/specific/AE2Sutff.zs b/overrides/scripts/specific/AE2Sutff.zs deleted file mode 100644 index 9faca276..00000000 --- a/overrides/scripts/specific/AE2Sutff.zs +++ /dev/null @@ -1,33 +0,0 @@ -#modloaded ae2stuff -# Imports -import mods.jei.JEI; - - - -######################################## -# Blocks -######################################## -# Pattern Encoder -JEI.removeAndHide(); - -# Crystal Growth Chamber -JEI.removeAndHide(); - -# Advanced Inscriber -JEI.removeAndHide(); - -# Wireless Connector -recipes.remove(); -assembler.recipeBuilder() - .circuit(2) - .inputs([ - * 4, - * 2, - , - - ]) - .fluidInputs([ * 1152]) - .outputs([]) - .duration(20) - .EUt(30720) - .buildAndRegister(); diff --git a/overrides/scripts/specific/CapabilityAdapter.zs b/overrides/scripts/specific/CapabilityAdapter.zs deleted file mode 100644 index 14772299..00000000 --- a/overrides/scripts/specific/CapabilityAdapter.zs +++ /dev/null @@ -1,16 +0,0 @@ -#modloaded rf-capability-adapter -# Imports -import mods.jei.JEI; - - - -######################################## -# Blocks -######################################## -# Capability Adapter -recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); diff --git a/overrides/scripts/specific/CompactMachines.zs b/overrides/scripts/specific/CompactMachines.zs deleted file mode 100644 index 5d93666a..00000000 --- a/overrides/scripts/specific/CompactMachines.zs +++ /dev/null @@ -1,120 +0,0 @@ -#modloaded compactmachines3 -# Imports -import mods.jei.JEI; - -JEI.hideCategory("compactmachines3.MultiblockMiniaturization"); -JEI.removeAndHide(); - - - -######################################## -# Items -######################################## -# Personal Shrinking Device -recipes.removeByRecipeName("compactmachines3:psd"); -recipes.addShaped(, [ - [null, , null], - [, , ], - [null, , null] -]); - -# Tunnel -assembler.recipeBuilder() - .inputs([ - , - , - - ]) - .outputs([ * 4]) - .duration(100) - .EUt(120) - .buildAndRegister(); - -# Redstone Tunnel -assembler.recipeBuilder() - .inputs([ - , - - ]) - .outputs([ * 4]) - .duration(100) - .EUt(120) - .buildAndRegister(); - - - -######################################## -# Blocks -######################################## -# Compact Machine Wall -recipes.addShaped( * 8, [ - [, , ], - [, , ], - [, , ] -]); - -# Tiny Compact Machine -assembler.recipeBuilder() - .inputs([ - * 8, - - ]) - .outputs([]) - .duration(200) - .EUt(120) - .buildAndRegister(); - -# Small Compact Machine -assembler.recipeBuilder() - .inputs([ - * 16, - - ]) - .outputs([]) - .duration(200) - .EUt(480) - .buildAndRegister(); - -# Normal Compact Machine -assembler.recipeBuilder() - .inputs([ - * 24, - - ]) - .outputs([]) - .duration(200) - .EUt(1920) - .buildAndRegister(); - -# Large Compact Machine -assembler.recipeBuilder() - .inputs([ - * 32, - - ]) - .outputs([]) - .duration(200) - .EUt(7680) - .buildAndRegister(); - -# Giant Compact Machine -assembler.recipeBuilder() - .inputs([ - * 40, - - ]) - .outputs() - .duration(200) - .EUt(30720) - .buildAndRegister(); - -# Maximum Compact Machine -assembler.recipeBuilder() - .inputs([ - * 48, - - ]) - .outputs() - .duration(200) - .EUt(122880) - .buildAndRegister(); diff --git a/overrides/scripts/specific/ExtraCells.zs b/overrides/scripts/specific/ExtraCells.zs deleted file mode 100644 index bcb00b15..00000000 --- a/overrides/scripts/specific/ExtraCells.zs +++ /dev/null @@ -1,89 +0,0 @@ -#modloaded extracells -# Imports -import mods.jei.JEI; -import crafttweaker.mods.IMod; -import crafttweaker.item.IItemStack; - -val ec2 as IMod = loadedMods["extracells"]; -if (!isNull(ec2)) { - val ec2Items as IItemStack[] = ec2.items; - - for item in ec2Items { - recipes.remove(item); - item.addTooltip(format.red("ExtraCells is out of support, please migration AE Additions!!")); - JEI.addDescription(item, "ExtraCells is out of support, please migration AE Additions!!"); - } -} - - - -######################################## -# Items -######################################## -# Fluid Storage Housing -recipes.addShapeless(, []); - -# Advanced Storage Housing -recipes.addShapeless(, []); - -# 256k ME Storage Component -recipes.addShapeless(, []); - -# 1024k ME Storage Component -recipes.addShapeless(, []); - -# 4096k ME Storage Component -recipes.addShapeless(, []); - -# 16384k ME Storage Component -recipes.addShapeless(, []); - -# 256k ME Fluid Storage Component -recipes.addShapeless(, []); - -# 1024k ME Fluid Storage Component -recipes.addShapeless(, []); - -# 4096k ME Fluid Storage Component -recipes.addShapeless(, []); - -# ME Portable Fluid Cell -recipes.addShapeless(, []); - -# Wireless Universal Terminal -recipes.addShapeless(, []); - -# Wireless Fluid Terminal -recipes.addShapeless(, []); - -# ME Upgrade (Tier 1) -recipes.addShapeless(, []); - -# ME Upgrade (Tier 2) -recipes.addShapeless(, []); - -# ME Upgrade (Tier 3) -recipes.addShapeless(, []); - - - -######################################## -# Blocks -######################################## -# ME Fluid Assembler -recipes.addShapeless(, []); - -# ME Fluid Auto Filler -recipes.addShapeless(, []); - -# Fluid Vibration Chamber -recipes.addShapeless(, []); - -# Blast resistant ME Drive -recipes.addShapeless(, []); - -# ME Drive Fixture -recipes.addShapeless(, []); - -# ME Energy Cell Fixture -recipes.addShapeless(, []); diff --git a/overrides/scripts/specific/FluxNetworks.zs b/overrides/scripts/specific/FluxNetworks.zs deleted file mode 100644 index 1ec16ec8..00000000 --- a/overrides/scripts/specific/FluxNetworks.zs +++ /dev/null @@ -1,85 +0,0 @@ -#modloaded fluxnetworks -# Imports -import mods.jei.JEI; - - - -######################################## -# Items -######################################## -# Flux -JEI.removeAndHide(); - -# Flux Core -JEI.removeAndHide(); - -# Flux Configurator -recipes.remove(); -recipes.addShaped(, [ - [null, , ], - [null, , ], - [, null, null] -]); - - - -######################################## -# Blocks -######################################## -# Flux Block -JEI.removeAndHide(); - -# Flux Plug -recipes.remove(); -assembler.recipeBuilder() - .circuit(4) - .inputs([ - * 2, - * 2, - , - - ]) - .outputs([]) - .duration(2000) - .EUt(1920) - .buildAndRegister(); - -# Flux Point -recipes.remove(); -assembler.recipeBuilder() - .circuit(6) - .inputs([ - * 2, - * 2, - , - - ]) - .outputs([]) - .duration(2000) - .EUt(1920) - .buildAndRegister(); - -# Flux Controller -recipes.remove(); -assembler.recipeBuilder() - .circuit(8) - .inputs([ - * 2, - * 2, - * 4, - * 4, - - ]) - .outputs([]) - .duration(2000) - .EUt(1920) - .buildAndRegister(); - -# Flux Storage -JEI.removeAndHide(); - -# Herculean Flux Storage -JEI.removeAndHide(); - -# Gargantuan Flux Storage -JEI.removeAndHide(); diff --git a/overrides/scripts/specific/SpiceOfLife.zs b/overrides/scripts/specific/SpiceOfLife.zs deleted file mode 100644 index ac8657e8..00000000 --- a/overrides/scripts/specific/SpiceOfLife.zs +++ /dev/null @@ -1,28 +0,0 @@ -#modloaded spiceoflife -# Imports -import mods.jei.JEI; - - - -######################################## -# Items -######################################## -# Food Journal -recipes.remove(); -recipes.addShapeless(, [, ]); - -# Lunchbag -recipes.remove(); -recipes.addShaped(, [ - [, null, ], - [, , ], - [null, null, null] -]); - -# Lunchbox -recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ], - [null, null, null] -]); diff --git a/overrides/scripts/specific/VolumetricFlask.zs b/overrides/scripts/specific/VolumetricFlask.zs deleted file mode 100644 index 7f3a4317..00000000 --- a/overrides/scripts/specific/VolumetricFlask.zs +++ /dev/null @@ -1,137 +0,0 @@ -#modloaded volumetricflask -# Imports -import mods.jei.JEI; -import crafttweaker.item.IItemStack; - - -######################################## -# Items -######################################## -# Flask -var flasks as IItemStack[] = [ - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag(), - .withEmptyTag() -]; -for flask in flasks { - recipes.remove(flask); -} -for i, flask in flasks { - .addItems([flasks[i]]); - assembler.recipeBuilder() - .circuit(i + 1) - .notConsumable([]) - .fluidInputs([ * 144]) - .outputs([flask]) - .duration(20) - .EUt(480) - .buildAndRegister(); -} -for i, flask in flasks { - extractor.recipeBuilder() - .inputs([flask]) - .fluidOutputs([ * 144]) - .duration(10) - .EUt(7) - .buildAndRegister(); -} -.addTooltip(format.red("VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!")); -JEI.addDescription(, "VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!"); - - - -######################################## -# Blocks -######################################## -# Interface -.addItems([ - , - -]); - -# Interface -recipes.remove(); -recipes.addShapeless(, []); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); -assembler.recipeBuilder() - .circuit(4) - .inputs([ - , - , - , - * 2 - ]) - .fluidInputs([ * 144]) - .outputs([]) - .duration(20) - .EUt(1920) - .buildAndRegister(); -packer.recipeBuilder() - .inputs([]) - .outputs([, * 4]) - .duration(10) - .EUt(7) - .buildAndRegister(); -.addTooltip(format.red("VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!")); -JEI.addDescription(, "VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!"); -.addTooltip(format.red("VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!")); -JEI.addDescription(, "VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!"); - -# Buffer -recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); -packer.recipeBuilder() - .inputs([]) - .outputs([, * 8]) - .duration(10) - .EUt(7) - .buildAndRegister(); -.addTooltip(format.red("VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!")); -JEI.addDescription(, "VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!"); - -# Filler -recipes.remove(); -assembler.recipeBuilder() - .inputs([ - * 2, - * 2, - * 4, - - ]) - .fluidInputs([ * 144]) - .outputs([]) - .duration(200) - .EUt(480) - .buildAndRegister(); -packer.recipeBuilder() - .inputs([]) - .outputs([, * 2]) - .duration(10) - .EUt(7) - .buildAndRegister(); -.addTooltip(format.red("VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!")); -JEI.addDescription(, "VolumetricFlask is out of support, please move AE2 Fluid Crafting Rework!!"); From 46e5cbf0dd77d7fcb57e00185e5afea2d7f0728b Mon Sep 17 00:00:00 2001 From: tier940 Date: Mon, 27 Nov 2023 23:49:37 +0900 Subject: [PATCH 2/2] Fix AE2Sutff --- .../groovy/postInit/normal/AE2Sutff.groovy | 33 +++++++++++++++++ .../groovy/postInit/specific/AE2Sutff.groovy | 36 ------------------- overrides/groovy/runConfig.json | 4 +-- 3 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 overrides/groovy/postInit/normal/AE2Sutff.groovy delete mode 100644 overrides/groovy/postInit/specific/AE2Sutff.groovy diff --git a/overrides/groovy/postInit/normal/AE2Sutff.groovy b/overrides/groovy/postInit/normal/AE2Sutff.groovy new file mode 100644 index 00000000..0028f8bc --- /dev/null +++ b/overrides/groovy/postInit/normal/AE2Sutff.groovy @@ -0,0 +1,33 @@ + + + +/* +* ######################################## +* Blocks +* ######################################## +*/ + +// Pattern Encoder +mods.jei.removeAndHide(item('ae2stuff:encoder')) + +// Crystal Growth Chamber +mods.jei.removeAndHide(item('ae2stuff:grower')) + +// Advanced Inscriber +mods.jei.removeAndHide(item('ae2stuff:inscriber')) + +// Wireless Connector +crafting.removeByOutput(item('ae2stuff:wireless')) +mods.gregtech.assembler.recipeBuilder() + .circuitMeta(2) + .inputs( + item('appliedenergistics2:material', 24) * 4, + item('gtexpert:meta_item_1', 1) * 2, + item('appliedenergistics2:material', 41), + item('gregtech:machine_casing', 6) + ) + .fluidInputs(fluid('fluix_alloy') * 1152) + .outputs(item('ae2stuff:wireless')) + .duration(20) + .EUt(30720) + .buildAndRegister() diff --git a/overrides/groovy/postInit/specific/AE2Sutff.groovy b/overrides/groovy/postInit/specific/AE2Sutff.groovy deleted file mode 100644 index 6f33e00e..00000000 --- a/overrides/groovy/postInit/specific/AE2Sutff.groovy +++ /dev/null @@ -1,36 +0,0 @@ - - - -if (isLoaded('ae2stuff')) { - /* - * ######################################## - * Blocks - * ######################################## - */ - - // Pattern Encoder - mods.jei.removeAndHide(item('ae2stuff:encoder')) - - // Crystal Growth Chamber - mods.jei.removeAndHide(item('ae2stuff:grower')) - - // Advanced Inscriber - mods.jei.removeAndHide(item('ae2stuff:inscriber')) - - // Wireless Connector - crafting.removeByOutput(item('ae2stuff:wireless')) - mods.gregtech.assembler.recipeBuilder() - .circuitMeta(2) - .inputs( - item('appliedenergistics2:material', 24) * 4, - item('gtexpert:meta_item_1', 1) * 2, - item('appliedenergistics2:material', 41), - item('gregtech:machine_casing', 6) - ) - .fluidInputs(fluid('fluix_alloy') * 1152) - .outputs(item('ae2stuff:wireless')) - .duration(20) - .EUt(30720) - .buildAndRegister() - -} diff --git a/overrides/groovy/runConfig.json b/overrides/groovy/runConfig.json index 1a1c602a..75b7fb0b 100644 --- a/overrides/groovy/runConfig.json +++ b/overrides/groovy/runConfig.json @@ -1,7 +1,7 @@ { - "packName": "GroovyScript", + "packName": "GregTech Expert 2", "packId": "gte2", - "version": "1.0.0", + "version": "0.1.0", "debug": false, "classes": { "preInit": []