From 70717e751049b8202e720412618163e359086171 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 19 Jan 2024 14:06:04 +0700 Subject: [PATCH] fixes for gt 1.1.0 --- kubejs/server_scripts/gregtech/recipes.js | 10 +++---- kubejs/server_scripts/minecraft/recipes.js | 2 +- kubejs/server_scripts/tfc/data.js | 8 ++--- kubejs/server_scripts/tfc/recipes.js | 34 +++++++++++----------- kubejs/startup_scripts/gtceu/constants.js | 4 +-- kubejs/startup_scripts/tfc/constants.js | 2 +- mods | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 5f77cda64..6bc20512b 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -74,7 +74,7 @@ const registerGTCEURecipes = (event) => { // Декрафт в электролайзере event.recipes.gtceu.electrolyzer('electrolyze_tfc_salt_water') .inputFluids(Fluid.of('tfc:salt_water', 1000)) - .itemOutputs('1x gtceu:sodium_hydroxide_dust', '2x gtceu:sodium_hydroxide_small_dust') + .itemOutputs('1x gtceu:sodium_hydroxide_dust', '2x gtceu:small_sodium_hydroxide_dust') .outputFluids(Fluid.of('gtceu:chlorine', 500), Fluid.of('gtceu:hydrogen', 500)) .duration(720) .EUt(30) @@ -126,14 +126,14 @@ const registerGTCEURecipes = (event) => { // Из сырого камня event.recipes.gtceu.lathe('stone_rod_from_stone') .itemInputs('#tfc:rock/raw') - .itemOutputs('gtceu:stone_rod', 'gtceu:stone_small_dust') + .itemOutputs('gtceu:stone_rod', 'gtceu:small_stone_dust') .duration(15) .EUt(2) // Из булыжника event.recipes.gtceu.lathe('stone_rod_from_cobblestone') .itemInputs('#forge:cobblestone') - .itemOutputs('gtceu:stone_rod', 'gtceu:stone_small_dust') + .itemOutputs('gtceu:stone_rod', 'gtceu:small_stone_dust') .duration(15) .EUt(2) @@ -521,7 +521,7 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.macerator('macerate_meat_to_dust') .itemInputs('#tfc:foods/meats') - .itemOutputs('gtceu:meat_dust', 'gtceu:bone_tiny_dust') + .itemOutputs('gtceu:meat_dust', 'gtceu:tiny_bone_dust') .duration(100) .EUt(2) @@ -588,7 +588,7 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.macerator('macerate_iron_door') .itemInputs('minecraft:iron_door') - .itemOutputs('gtceu:iron_dust', 'gtceu:steel_tiny_dust') + .itemOutputs('gtceu:iron_dust', 'gtceu:tiny_steel_dust') .duration(200) .EUt(8) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 1cd5daebd..74680b48f 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -743,7 +743,7 @@ const registerMinecraftRecipes = (event) => { .itemInputs('') .chancedOutput('tfc:sand/yellow', 9000, 300) .chancedOutput('gtceu:tungstate_small_dust', 1250, 450) - .chancedOutput('gtceu:platinum_tiny_dust', 630, 150) + .chancedOutput('gtceu:tiny_platinum_dust', 630, 150) .outputFluids(Fluid.of('gtceu:helium', 2000)) .duration(250) .EUt(30)*/ diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index a95c8d1a0..9d8692ac5 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -129,12 +129,12 @@ const registerTFCLampFuels = (event) => { const registerTFCFertilizers = (event) => { event.fertilizer('gtceu:fertilizer', 0.15, 0.15, 0.15) - event.fertilizer('gtceu:potassium_tiny_dust', null, null, 0.016) - event.fertilizer('gtceu:potassium_small_dust', null, null, 0.037) + event.fertilizer('gtceu:tiny_potassium_dust', null, null, 0.016) + event.fertilizer('gtceu:small_potassium_dust', null, null, 0.037) event.fertilizer('gtceu:potassium_dust', null, null, 0.15) - event.fertilizer('gtceu:phosphorus_tiny_dust', null, 0.016, null) - event.fertilizer('gtceu:phosphorus_small_dust', null, 0.037, null) + event.fertilizer('gtceu:tiny_phosphorus_dust', null, 0.016, null) + event.fertilizer('gtceu:small_phosphorus_dust', null, 0.037, null) event.fertilizer('gtceu:phosphorus_dust', null, 0.15, null) } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a95527ea2..a61fabe1a 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1902,49 +1902,49 @@ const registerTFCRecipes = (event) => { // Сырой event.recipes.gtceu.macerator(`raw_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/raw/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Булыжник event.recipes.gtceu.macerator(`cobble_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/cobble/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Гладкий event.recipes.gtceu.macerator(`smooth_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/smooth/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Кирпичи event.recipes.gtceu.macerator(`bricks_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/bricks/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Потрескавшиеся кирпичи event.recipes.gtceu.macerator(`cracked_bricks_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/cracked_bricks/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Замшелый булыжник event.recipes.gtceu.macerator(`mossy_cobble_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/mossy_cobble/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Замшелый кирпич event.recipes.gtceu.macerator(`mossy_bricks_stairs_${stone}_to_dust`) .itemInputs(`tfc:rock/mossy_bricks/${stone}_stairs`) - .itemOutputs(`6x gtceu:${stone}_small_dust`) + .itemOutputs(`6x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) @@ -1955,49 +1955,49 @@ const registerTFCRecipes = (event) => { // Сырой event.recipes.gtceu.macerator(`raw_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/raw/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Булыжник event.recipes.gtceu.macerator(`cobble_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/cobble/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Гладкий event.recipes.gtceu.macerator(`smooth_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/smooth/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Кирпичи event.recipes.gtceu.macerator(`bricks_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/bricks/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Потрескавшиеся кирпичи event.recipes.gtceu.macerator(`cracked_bricks_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/cracked_bricks/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Замшелый булыжник event.recipes.gtceu.macerator(`mossy_cobble_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/mossy_cobble/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) // Замшелый кирпич event.recipes.gtceu.macerator(`mossy_bricks_slab_${stone}_to_dust`) .itemInputs(`tfc:rock/mossy_bricks/${stone}_slab`) - .itemOutputs(`2x gtceu:${stone}_small_dust`) + .itemOutputs(`2x gtceu:small_${stone}_dust`) .duration(4) .EUt(75) @@ -2081,8 +2081,8 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.centrifuge('soul_sand_separation') .itemInputs('minecraft:soul_sand') .chancedOutput('tfc:sand/yellow', 9000, 130) - .chancedOutput('gtceu:saltpeter_small_dust', 8000, 480) - .chancedOutput('gtceu:coal_tiny_dust', 2000, 340) + .chancedOutput('gtceu:small_saltpeter_dust', 8000, 480) + .chancedOutput('gtceu:tiny_coal_dust', 2000, 340) .outputFluids(Fluid.of('gtceu:oil', 80)) .duration(200) .EUt(80) @@ -2108,7 +2108,7 @@ const registerTFCRecipes = (event) => { .itemInputs('#tfc:dirt') .chancedOutput('gtceu:plant_ball', 1250, 700) .chancedOutput('tfc:sand/yellow', 5000, 1200) - .chancedOutput('gtceu:clay_tiny_dust', 4000, 900) + .chancedOutput('gtceu:tiny_clay_dust', 4000, 900) .outputFluids(Fluid.of('gtceu:oil', 2000)) .duration(250) .EUt(30) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 2b9fde612..14cdaaa8e 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -3,8 +3,8 @@ global.GTCEU_DISABLED_ITEMS = [ // Пыль пшеницы 'gtceu:wheat_dust', - 'gtceu:wheat_small_dust', - 'gtceu:wheat_tiny_dust', + 'gtceu:small_wheat_dust', + 'gtceu:tiny_wheat_dust', // Bronze Machines 'gtceu:bronze_machine_casing', diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index a8a87f279..d5c549c9d 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -716,7 +716,7 @@ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:lumber': { name: 'lumber', output: ['1x gtceu:wood_dust'] }, '#tfc:support_beams': { name: 'support_beams', output: ['2x gtceu:wood_dust'] }, // '#minecraft:boats': { name: 'boats', output: ['5x gtceu:wood_dust'] }, - '#tfc:minecarts': { name: 'minecarts', output: ['5x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, + '#tfc:minecarts': { name: 'minecarts', output: ['5x gtceu:wood_dust', '1x gtceu:small_wrought_iron_dust'] }, '#minecraft:signs': { name: 'signs', output: ['1x gtceu:wood_dust'] }, '#minecraft:hanging_signs': { name: 'hanging_signs', output: ['1x gtceu:wood_dust'] }, '#minecraft:logs': { name: 'logs', output: ['6x gtceu:wood_dust'] }, diff --git a/mods b/mods index f655d9718..cd11e2324 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit f655d9718353f7d745773217c7321c655e31362a +Subproject commit cd11e2324ef50eb5759cf738eced79409b89a36f