diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 3e59f4513..a63d4abff 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -6,9 +6,6 @@ const registerTooltips = (event) => event.addAdvanced(['minecraft:name_tag'], (item, advanced, text) => { text.add(1, [text.of('Used on a Scribing Table along with an item to name it, or with black dye to name the tag.')]) }) - event.addAdvanced(['gtceu:greenhouse'], (item, advanced, text) => { - text.add(1, [text.of('Currently, due to some errors in GTCEu regarding forgeCapacities, outputs rotten food.')]) - }) event.addAdvanced(['toolbelt:belt'], (item, advanced, text) => { text.add(1, [text.of('Press the §o§6Swap Tool§r keybind to open the radial menu.')]), text.add(2, [text.of(`You can also right click with it in hand to add or remove tools.`)]) @@ -31,7 +28,8 @@ const registerTooltips = (event) => text.add(1, text.of('§cSuperheat§r with Coke, or Flawless and Exquisite coal gems.')) }) event.addAdvanced(['gtceu:greenhouse'], (item, advanced, text) => { - text.add(1, text.of('This machine has a Perfect Overclock!')), + text.add(1, text.of('This machine has a §2Perfect Overclock§r!')), + text.add(2, text.of('Currently, due to a bug, sometimes outputs rotten food.')) }) event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { text.add(1, text.of('Artificial enviroment to simulate the Nether.')), diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 3e5403c92..1dd94ab88 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -728,7 +728,7 @@ function registerGTCEuMachineRecipes(event) { ], { A: '#gtceu:circuits/mv', B: 'gtceu:copper_single_cable', - C: '#gtceu:circuits/mv', + C: 'tfc:compost', D: 'gtceu:solid_machine_casing' }).id('tfg:shaped/greenhouse') diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index a62224601..b60fe890b 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -15,14 +15,15 @@ const registerGTCEuMachines = (event) => { event.create('greenhouse', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .recipeType('greenhouse') + .recipeModifiers([GTRecipeModifiers.OC_PERFECT]) .appearanceBlock(GTBlocks.CASING_STEEL_SOLID) .pattern(definition => FactoryBlockPattern.start() .aisle("CCCCCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ") - .aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ") - .aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ") - .aisle("CDDDDDC", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "FFFFFFF") - .aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ") - .aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ") + .aisle("CDDDDDC", "X X", "X X", "X X", "X X", "X X", "X X", "X X", " XXFXX ") + .aisle("CDDDDDC", "X X", "X X", "X X", "X X", "X X", "X X", "X X", " XXFXX ") + .aisle("CDDDDDC", "F F", "F F", "F F", "F F", "F F", "F F", "F F", "FFFFFFF") + .aisle("CDDDDDC", "X X", "X X", "X X", "X X", "X X", "X X", "X X", " XXFXX ") + .aisle("CDDDDDC", "X X", "X X", "X X", "X X", "X X", "X X", "X X", " XXFXX ") .aisle("CCCYCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ") .where('X', Predicates.blocks('ae2:quartz_glass')) .where('F', Predicates.frames('steel')) @@ -35,7 +36,6 @@ const registerGTCEuMachines = (event) => { .or(Predicates.blocks('tfc:grass/sandy_loam')) .or(Predicates.blocks('tfc:grass/silty_loam'))) .where('C', Predicates.blocks('gtceu:steel_machine_casing').or(Predicates.autoAbilities(definition.getRecipeTypes()))) - .where('#', Predicates.air()) .where(' ', Predicates.any()) .where('Y', Predicates.controller(Predicates.blocks(definition.get()))) .build() diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 0645e0807..7ba54d0be 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -5,7 +5,6 @@ const registerGTCEuRecipeTypes = (event) => { .category('greenhouse') .setEUIO('in') .setMaxIOSize(3, 4, 1, 0) - .recipeModifiers([GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK)]) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH)