diff --git a/CHANGELOG.md b/CHANGELOG.md index e3932cd72..abc8b79c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ - Added many new advanced food items including freeze-dried fruit, calorie paste, and meal bags. @Redeix - Quest updates for all of the above. @TomPlop ### Minor changes -- Balance changes for water wheels @Pyritie +- Balance changes for water wheels and glowstone blocks @Pyritie - Added a second recipe for water flask sides so it doesn't matter if you craft it top-aligned or bottom-aligned @Pyritie - More recipes to craft dyes @Pyritie - Adjusted the textures of the generated raw ore items @Pyritie diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 5a8ee4fac..6541aa258 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -604,6 +604,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/pickaxe_iron' }) event.remove({ id: 'gtceu:shaped/gear_diamond' }) event.remove({ id: 'gtceu:shaped/buzzsaw_blade_diamond' }) + event.remove({ id: 'gtceu:shaped/purpur_stair_saw' }) event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' }) @@ -626,6 +627,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:assembler/map' }) event.remove({ id: 'gtceu:assembler/spyglass' }) + event.remove({ id: 'gtceu:assembler/assemble_purpur_into_stair' }) event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' }) @@ -653,6 +655,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down_distilled_water' }) event.remove({ id: 'gtceu:compressor/compress_certus_quartz_to_raw_ore_block' }) + event.remove({ id: 'gtceu:compressor/glowstone' }) + + event.remove({ id: 'gtceu:forming_press/form_purpur_slab_into_pillar' }) // Remove vanilla Eye of Ender diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 15d19f0b4..84b6a9d7c 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -22,7 +22,8 @@ function registerTFGRockRecipes(event) { { loose: 'tfg:brick/mercury_stone', block: '4x ad_astra:mercury_stone_bricks' }, { loose: 'tfg:loose/glacio_stone', block: 'ad_astra:glacio_cobblestone' }, { loose: 'tfg:brick/glacio_stone', block: '4x ad_astra:glacio_stone_bricks' }, - { loose: 'tfg:brick/permafrost', block: '4x ad_astra:permafrost_bricks' } + { loose: 'tfg:brick/permafrost', block: '4x ad_astra:permafrost_bricks' }, + { loose: 'minecraft:popped_chorus_fruit', block: '4x minecraft:purpur_block' } ] GLUEING_TOGETHER.forEach(x => { @@ -501,6 +502,13 @@ function registerTFGRockRecipes(event) { wall: 'ae2:fluix_wall', dust: 'ae2:fluix_dust', stonecutting: true + }, + { + raw: 'minecraft:purpur_block', + stair: 'minecraft:purpur_stairs', + slab: 'minecraft:purpur_slab', + dust: null, + stonecutting: true } // #endregion ] @@ -513,12 +521,14 @@ function registerTFGRockRecipes(event) { event.stonecutting(x.stair, x.raw).id(`${x.raw}_to_${x.stair}`.replace(/:/g, '_')) } - event.recipes.gtceu.macerator(`macerate_${x.stair}`.replace(/:/g, '_')) - .itemInputs(x.stair) - .itemOutputs(x.dust) - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + if (x.dust != null) { + event.recipes.gtceu.macerator(`macerate_${x.stair}`.replace(/:/g, '_')) + .itemInputs(x.stair) + .itemOutputs(x.dust) + .duration(150) + .EUt(2) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + } if ("loose" in x) { event.shapeless(`3x ${x.loose}`, [x.stair]) @@ -531,12 +541,14 @@ function registerTFGRockRecipes(event) { event.stonecutting(`2x ${x.slab}`, x.raw).id(`${x.raw}_to_${x.slab}`.replace(/:/g, '_')) } - event.recipes.gtceu.macerator(`macerate_${x.slab}`.replace(/:/g, '_')) - .itemInputs(`2x ${x.slab}`) - .itemOutputs(x.dust) - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + if (x.dust != null) { + event.recipes.gtceu.macerator(`macerate_${x.slab}`.replace(/:/g, '_')) + .itemInputs(`2x ${x.slab}`) + .itemOutputs(x.dust) + .duration(150) + .EUt(2) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + } if ("loose" in x) { event.shapeless(`2x ${x.loose}`, [x.slab]) @@ -549,12 +561,14 @@ function registerTFGRockRecipes(event) { event.stonecutting(x.wall, x.raw).id(`${x.raw}_to_${x.wall}`.replace(/:/g, '_')) } - event.recipes.gtceu.macerator(`macerate_${x.wall}`.replace(/:/g, '_')) - .itemInputs(x.wall) - .itemOutputs(x.dust) - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + if (x.dust != null) { + event.recipes.gtceu.macerator(`macerate_${x.wall}`.replace(/:/g, '_')) + .itemInputs(x.wall) + .itemOutputs(x.dust) + .duration(150) + .EUt(2) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + } } if ("loose" in x) { @@ -570,7 +584,8 @@ function registerTFGRockRecipes(event) { { raw: 'ad_astra:venus_stone_bricks', pillar: 'ad_astra:venus_pillar' }, { raw: 'ad_astra:mercury_stone_bricks', pillar: 'ad_astra:mercury_pillar' }, { raw: 'ad_astra:glacio_stone_bricks', pillar: 'ad_astra:glacio_pillar' }, - { raw: 'ad_astra:permafrost_bricks', pillar: 'ad_astra:permafrost_pillar' } + { raw: 'ad_astra:permafrost_bricks', pillar: 'ad_astra:permafrost_pillar' }, + { raw: 'minecraft:purpur_block', pillar: 'minecraft:purpur_pillar' } ] PILLARS.forEach(x => { diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 14ef74306..3ac41fac7 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -608,6 +608,14 @@ function registerVintageImprovementsRecipes(event) { results: [{ item: 'gtceu:raw_rubber_dust' }], processingTime: 120 }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') + + event.custom({ + type: 'vintageimprovements:pressurizing', + ingredients: [{ item: 'minecraft:glowstone_dust', count: 4 }], + results: [{ item: 'minecraft:glowstone' }], + heatRequirement: "heated", + processingTime: 300 + }).id('tfg:vi/pressurizing/glowstone') // #endregion diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index d2a8f970b..49b114afb 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -15,7 +15,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:infested_deepslate', // Каменные блоки - 'minecraft:stone', 'minecraft:stone_stairs', 'minecraft:stone_slab', 'minecraft:stone_pressure_plate', @@ -613,10 +612,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:honey_bottle', 'minecraft:honeycomb_block', 'minecraft:honey_block', - 'minecraft:purpur_pillar', - 'minecraft:purpur_block', - 'minecraft:purpur_stairs', - 'minecraft:purpur_slab', 'minecraft:shears', 'minecraft:lantern', 'minecraft:soul_lantern', diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index ae62bef07..3d642f7ba 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -85,7 +85,8 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:netherite_rod', 'vintageimprovements:nethersteel_rod', 'vintageimprovements:andesite_rod', - 'vintageimprovements:shadow_steel_rod' + 'vintageimprovements:shadow_steel_rod', + 'vintageimprovements:desh_rod' ] global.VINTAGE_IMPROVEMENTS_DISABLED_BLOCKS = [