diff --git a/config/gtceu.yaml b/config/gtceu.yaml index ac5619f6c..f743e30c4 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -67,7 +67,7 @@ recipes: # Whether to remove Vanilla Block Recipes from the Crafting Table. # Default: false - removeVanillaBlockRecipes: false + removeVanillaBlockRecipes: true # Whether to remove Vanilla TNT Recipe from the Crafting Table. # Default: true @@ -153,7 +153,7 @@ machines: # Whether Steam Multiblocks should use Steel instead of Bronze. # Default: false - steelSteamMultiblocks: false + steelSteamMultiblocks: true # Whether to enable the cleanroom, required for various recipes. # Default: true @@ -177,7 +177,7 @@ machines: # Wether to add a "Bedrock Ore Miner" (also enables bedrock ore generation) # Default: false - doBedrockOres: false + doBedrockOres: true # What Kind of material should the bedrock ore miner output? # Default: "raw" diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 7340b8717..40da50382 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -28,4 +28,3 @@ REIEvents.hide('fluid', event => { hideTFCFluids(event) hideFirmaLifeFluids(event) }) - diff --git a/kubejs/client_scripts/mods/gtceu.js b/kubejs/client_scripts/mods/gtceu.js index 72acf827d..5d6da9097 100644 --- a/kubejs/client_scripts/mods/gtceu.js +++ b/kubejs/client_scripts/mods/gtceu.js @@ -1,13 +1,6 @@ // priority: 0 const hideGTCEUStuff = (event) => { - // Hide unused GT ores - GTRegistries.MATERIALS.forEach(material => { - global.VANILLA_STONE_TYPES.forEach(stoneTypeName => { - event.hide(`#forge:ores/${stoneTypeName}/${material}`) - }) - }) - global.GTCEU_DISABLED_ITEMS.forEach(item => { event.hide(item) }) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2be3867d0..b9d123e5c 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -18,11 +18,6 @@ const registerTFCRecipes = (event) => { event.recipes.tfc.casting(`gtceu:${metal}_ingot`, 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.fluid, 144), 0.01) .id(`tfc:casting/${metal}_fire_ingot`) - // Декрафт слитка в жидкость - event.recipes.tfc.heating(`gtceu:${metal}_ingot`, metalSpecs.melt_temp) - .resultFluid(Fluid.of(metalSpecs.fluid, 144)) - .id(`tfc:heating/metal/${metal}_ingot`) - } // Металлы не дублирующие гт else @@ -34,12 +29,12 @@ const registerTFCRecipes = (event) => { // Отливка слитка в огнеупорной форме event.recipes.tfc.casting(`tfc:metal/ingot/${metal}`, 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.fluid, 144), 0.01) .id(`tfc:casting/${metal}_fire_ingot`) - - // Декрафт слитка в жидкость - event.recipes.tfc.heating(`tfc:metal/ingot/${metal}`, metalSpecs.melt_temp) - .resultFluid(Fluid.of(metalSpecs.fluid, 144)) - .id(`tfc:heating/metal/${metal}_ingot`) } + + // Декрафт слитка в жидкость + event.recipes.tfc.heating(`#forge:ingots/${metal}`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.fluid, 144)) + .id(`tfc:heating/metal/${metal}_ingot`) } // Двойные слитки diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 06ea7dff3..e5dbe04d3 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -109,11 +109,11 @@ const registerTFCItemTags = (event) => { } const registerTFCBlockTags = (event) => { - event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore') - event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore') - event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore') - event.add('tfc:monster_spawns_on', '#forge:tfc_stonetype_ore') - event.add('tfc:prospectable', '#forge:tfc_stonetype_ore') + event.add('tfc:can_collapse', '#forge:ores') + event.add('tfc:can_start_collapse', '#forge:ores') + event.add('tfc:can_trigger_collapse', '#forge:ores') + event.add('tfc:monster_spawns_on', '#forge:ores') + event.add('tfc:prospectable', '#forge:ores') event.add('tfc:glass_basin_blocks', 'gtceu:brass_block') event.add('tfc:glass_pouring_table', 'gtceu:brass_block') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 15db7eea9..6226d205b 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -200,8 +200,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:lantern", "minecraft:soul_torch", "minecraft:soul_lantern", - "minecraft:copper_ingot", "minecraft:gold_ingot", + "minecraft:copper_ingot", // Seeds "minecraft:wheat_seeds", diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 654b701db..8c01d7eb6 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -82,8 +82,6 @@ global.TFC_DISABLED_ITEMS = [ "tfc:metal/ingot/red_steel", "tfc:metal/ingot/blue_steel", "tfc:metal/ingot/brass", - "tfc:metal/ingot/copper", - "tfc:metal/ingot/gold", "tfc:metal/ingot/nickel", "tfc:metal/ingot/silver", "tfc:metal/ingot/tin",