From 79e2b7947ea23c03d21a539cd9649935e9f0d0ff Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 28 Jan 2024 19:17:48 +0700 Subject: [PATCH] fix for gtceu 1.1.2 --- config/firstperson.json | 7 ++- config/jei/recipe-category-sort-order.ini | 4 +- config/voicechat/voicechat-client.properties | 9 ++-- config/voicechat/voicechat-server.properties | 2 +- kubejs/server_scripts/gregtech/recipes.js | 2 +- kubejs/server_scripts/main_server_script.js | 45 +++++++------------- kubejs/server_scripts/tfc/recipes.js | 2 +- 7 files changed, 32 insertions(+), 39 deletions(-) diff --git a/config/firstperson.json b/config/firstperson.json index b5e2cbb20..955280d45 100644 --- a/config/firstperson.json +++ b/config/firstperson.json @@ -1,5 +1,5 @@ { - "configVersion": 1, + "configVersion": 2, "enabledByDefault": false, "xOffset": 0, "sneakXOffset": 0, @@ -7,5 +7,8 @@ "renderStuckFeatures": true, "vanillaHands": false, "doubleHands": false, - "autoVanillaHands": [] + "autoVanillaHands": [], + "autoToggleModItems": [ + "exposure:camera" + ] } \ No newline at end of file diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 08cc437f2..c004ffda1 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -50,8 +50,6 @@ firmalife:mixing_bowl firmalife:oven firmalife:smoking firmalife:vat -ftbquests:loot_crate -ftbquests:quest jei:information jumbofurnace:jumbo_furnace_upgrade jumbofurnace:jumbo_smelting @@ -81,3 +79,5 @@ tfc:simple_pot tfc:soup_pot tfc:welding treetap:tap_extract +ftbquests:loot_crate +ftbquests:quest diff --git a/config/voicechat/voicechat-client.properties b/config/voicechat/voicechat-client.properties index ba4350878..6528370f1 100644 --- a/config/voicechat/voicechat-client.properties +++ b/config/voicechat/voicechat-client.properties @@ -1,4 +1,4 @@ -# Simple Voice Chat client config v1.20.1-2.4.32 +# Simple Voice Chat client config v1.20.1-2.5.0 # The voice chat volume voice_chat_volume=1.0 @@ -79,7 +79,10 @@ audio_type=NORMAL # If the mod should load native libraries # If set to false, the Java Opus implementation will be used, the denoiser won't be available and you won't be able to record audio. use_natives=true -# This lets you hear players near you, even though you are further away with your freecam -freecam_support=true +# How listening to other players should work when using freecam mods +# Possible values are 'CAMERA' and 'PLAYER' +# CAMERA: You will hear voice chat audio around your camera. Whether you hear distant audio depends on the voice chat broadcast range of the server +# PLAYER: You will hear voice chat audio around your player no matter where your camera is +freecam_mode=CAMERA # If enabled, you will be automatically muted when joining a world mute_on_join=false diff --git a/config/voicechat/voicechat-server.properties b/config/voicechat/voicechat-server.properties index 6bc254ffe..b19557c99 100644 --- a/config/voicechat/voicechat-server.properties +++ b/config/voicechat/voicechat-server.properties @@ -1,4 +1,4 @@ -# Simple Voice Chat server config v1.20.1-2.4.32 +# Simple Voice Chat server config v1.20.1-2.5.0 # The port of the voice chat server # Setting this to "-1" sets the port to the Minecraft servers port (Not recommended) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 233ff05ba..d3f811e61 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1277,7 +1277,7 @@ const registerGTCEURecipes = (event) => { //#region Рецепты, которые итерируются по всем материалам - GTRegistries.MATERIALS.forEach(material => { + GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => { //#region Рецепты инструментов diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 3f0668199..829bbc4b2 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -101,36 +101,23 @@ GTCEuServerEvents.oreVeins(event => { * Срабатывает после инициализации датапаков и тегов. */ ServerEvents.recipes(event => { - /* - registerTFCRecipes(event) - registerFirmaLifeRecipes(event) - registerFirmaCivRecipes(event) - registerWaterFlasksRecipes(event) - registerTreeTapRecipes(event) - - registerMinecraftRecipes(event) - - registerGTCEURecipes(event) - - registerCreateRecipes(event) - registerCreateAdditionsRecipes(event) - registerRailWaysRecipes(event) - registerAE2Recipes(event) registerAE2WTLibRecipes(event) - - registerComputerCraftRecipes(event) - - registerMoreRedRecipes(event) - - registerSophisticatedBackpacksRecipes(event) - - registerToolBeltRecipes(event) - - registerExposureRecipes(event) - - registerFTBQuestsRecipes(event) - registerChiselAndBitsRecipes(event) - */ + registerComputerCraftRecipes(event) + registerCreateRecipes(event) + registerCreateAdditionsRecipes(event) + registerExposureRecipes(event) + registerFirmaCivRecipes(event) + registerFirmaLifeRecipes(event) + registerFTBQuestsRecipes(event) + registerGTCEURecipes(event) + registerMinecraftRecipes(event) + registerMoreRedRecipes(event) + registerRailWaysRecipes(event) + registerSophisticatedBackpacksRecipes(event) + registerTFCRecipes(event) + registerToolBeltRecipes(event) + registerTreeTapRecipes(event) + registerWaterFlasksRecipes(event) }) \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f2c856f9f..ff12c5663 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -21,7 +21,7 @@ const registerTFCRecipes = (event) => { event.remove({ id: /tfc:crafting\/metal\/block\/*_slab/ }) event.remove({ id: /tfc:heating\/metal\/*_block_slab/ }) - GTRegistries.MATERIALS.forEach(material => { + GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)