diff --git a/CHANGELOG.md b/CHANGELOG.md index 432db958e..f378d34c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fixed tooltips on the uncolored small vessel and AFC wooden supports (Pyritie) - Fixed assembler clay recipes so they output the correct amount (Pyritie) - Quest fixes/tweaks (Pyritie) +- Added aluminium, stainless steel, and titanium millstones (Pyritie) ## [0.9.5] - 08.05.2025 ### Changes diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index fa61bea95..63be68f74 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -190,18 +190,54 @@ function registerGreateRecipes(event) { ], { A: '#forge:smooth_stone', B: 'gtceu:treated_wood_slab', - C: '#forge:small_gears/steel', + C: '#forge:small_gears/wrought_iron', D: '#forge:tools/hammers', E: '#forge:tools/wrenches', F: '#forge:dusts/diamond' }).id('greate:shaped/steel_millstone') event.recipes.gtceu.assembler('greate:steel_millstone') - .itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/steel', '2x #forge:dusts/diamond') + .itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/wrought_iron', '2x #forge:dusts/diamond') .itemOutputs('greate:steel_millstone') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + event.shaped('greate:aluminium_millstone', [ + 'BCB', + 'FGF', + 'AAA' + ], { + A: '#forge:double_plates/vanadium_steel', + B: '#gtceu:circuits/mv', + C: '#forge:gears/steel', + F: '#forge:gems/diamond', + G: 'gtceu:mv_machine_casing' + }).id('greate:shaped/aluminium_millstone') + + event.shaped('greate:stainless_steel_millstone', [ + 'BCB', + 'FGF', + 'AAA' + ], { + A: '#forge:double_plates/red_steel', + B: '#gtceu:circuits/hv', + C: '#forge:gears/aluminium', + F: 'gtceu:diamond_grinding_head', + G: 'gtceu:hv_machine_casing' + }).id('greate:shaped/stainless_steel_millstone') + + event.shaped('greate:titanium_millstone', [ + 'BCB', + 'FGF', + 'AAA' + ], { + A: '#forge:double_plates/ultimet', + B: '#gtceu:circuits/ev', + C: '#forge:gears/stainless_steel', + F: 'gtceu:diamond_grinding_head', + G: 'gtceu:ev_machine_casing' + }).id('greate:shaped/titanium_millstone') + // #endregion // #region Crushing wheels diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 309cff3c5..733fcbf73 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -103,7 +103,8 @@ function registerGreateRecyclingRecipes(event) { event.recipes.gtceu.macerator('greate:steel_millstone') .itemInputs('greate:steel_millstone') .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1), ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2)) .duration(GTMaterials.Steel.getMass() * 4) .category(GTRecipeCategories.MACERATOR_RECYCLING) @@ -111,11 +112,80 @@ function registerGreateRecyclingRecipes(event) { event.recipes.gtceu.arc_furnace('greate:steel_millstone') .itemInputs('greate:steel_millstone') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1)) .duration(GTMaterials.Steel.getMass() * 4) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.macerator('greate:aluminium_millstone') + .itemInputs('greate:aluminium_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 8), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 6), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)) + .duration(GTMaterials.Aluminium.getMass() * (8+6+4+2)) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:aluminium_millstone') + .itemInputs('greate:aluminium_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 8), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 6), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) + .duration(GTMaterials.Aluminium.getMass() * (8+6+4)) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('greate:stainless_steel_millstone') + .itemInputs('greate:stainless_steel_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 8), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 6), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 5)) + .duration(GTMaterials.StainlessSteel.getMass() * (8+8+6+4+5)) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:stainless_steel_millstone') + .itemInputs('greate:stainless_steel_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 8), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 6), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4)) + .duration(GTMaterials.StainlessSteel.getMass() * (8+8+6+4)) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('greate:titanium_millstone') + .itemInputs('greate:titanium_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 8), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 8), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 6), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 5)) + .duration(GTMaterials.Titanium.getMass() * (8+8+6+4+5)) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:titanium_millstone') + .itemInputs('greate:titanium_millstone') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 8), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 8), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 6), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4)) + .duration(GTMaterials.Titanium.getMass() * (8+8+6+4)) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + // #endregion // #region Crushing Wheels diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index a2ffc4d19..8771d171b 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -7,6 +7,11 @@ function removeGreateRecipes(event) { event.remove({ output: item }) }) + global.GREATE_DISABLED_FLUIDS.forEach(fluid => { + event.remove({ input: fluid }) + event.remove({ output: fluid }) + }) + event.remove({ mod: 'greate', input: 'create:andesite_alloy' }); event.remove({ id: 'greate:shapeless/large_andesite_alloy_cogwheel_from_little' }) @@ -18,7 +23,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:shaped/andesite_alloy_shaft' }) // Until we got a fix from Greate for recipes in a cleanroom - event.remove({ id: 'greate:shaped/stainless_steel_mechanical_saw' }) + event.remove({ id: 'greate:shaped/stainless_steel_mechanical_saw' }) event.remove({ id: 'greate:shaped/titanium_mechanical_saw' }) event.remove({ id: 'greate:splashing/dough' }) diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 31af4a66d..5de64da69 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -25,9 +25,6 @@ global.GREATE_DISABLED_ITEMS = [ 'greate:andesite_alloy_encased_fan', 'greate:andesite_alloy_mechanical_mixer', 'greate:andesite_alloy_mechanical_pump', - 'greate:aluminium_millstone', - 'greate:stainless_steel_millstone', - 'greate:titanium_millstone', // Disabled because they don't respect the cleanroom requirement of some recipes 'greate:stainless_steel_mechanical_saw',