start work on recipes

2023-12-09 12:54:18 +07:00 · 2023-12-09 12:54:18 +07:00 · 8e5e1a0ab5
commit 8e5e1a0ab5
parent b3b007bcad
9 changed files with 126 additions and 1248 deletions
--- a/kubejs/assets/tfg/lang/en_us.json
+++ b/kubejs/assets/tfg/lang/en_us.json
@ -0,0 +1,21 @@
+{
+    "metal.tfg.tin": "Tin",
+    "metal.tfg.bismuth": "Bismuth",
+    "metal.tfg.zinc": "Zinc",
+    "metal.tfg.sterling_silver": "Sterling Silver",
+    "metal.tfg.rose_gold": "Rose Gold",
+    "metal.tfg.silver": "Silver",
+    "metal.tfg.gold": "Gold",
+    "metal.tfg.copper": "Copper",
+    "metal.tfg.nickel": "Nickel",
+    "metal.tfg.brass": "Brass",
+    "metal.tfg.bronze": "Bronze",
+    "metal.tfg.bismuth_bronze": "Bismuth Bronze",
+    "metal.tfg.black_bronze": "Black Bronze",
+    "metal.tfg.iron": "Iron",
+    "metal.tfg.wrought_iron": "Wrought Iron",
+    "metal.tfg.steel": "Steel",
+    "metal.tfg.black_steel": "Black Steel",
+    "metal.tfg.blue_steel": "Blue Steel",
+    "metal.tfg.red_steel": "Red Steel"
+}
--- a/kubejs/assets/tfg/lang/ru_ru.json
+++ b/kubejs/assets/tfg/lang/ru_ru.json
@ -0,0 +1,21 @@
+{
+    "metal.tfg.tin": "Олово",
+    "metal.tfg.bismuth": "Висмут",
+    "metal.tfg.zinc": "Цинк",
+    "metal.tfg.sterling_silver": "Серебро Стерлинга",
+    "metal.tfg.rose_gold": "Розовое золото",
+    "metal.tfg.silver": "Серебро",
+    "metal.tfg.gold": "Золото",
+    "metal.tfg.copper": "Медь",
+    "metal.tfg.nickel": "Никель",
+    "metal.tfg.brass": "Латунь",
+    "metal.tfg.bronze": "Бронза",
+    "metal.tfg.bismuth_bronze": "Висмутная бронза",
+    "metal.tfg.black_bronze": "Черная бронза",
+    "metal.tfg.iron": "Железо",
+    "metal.tfg.wrought_iron": "Кованное железо",
+    "metal.tfg.steel": "Сталь",
+    "metal.tfg.black_steel": "Черная сталь",
+    "metal.tfg.blue_steel": "Синяя сталь",
+    "metal.tfg.red_steel": "Красная сталь"
+}
--- a/kubejs/config/client.properties
+++ b/kubejs/config/client.properties
@ -1,5 +1,5 @@
 #KubeJS Client Properties
-#Tue Nov 28 16:58:18 NOVT 2023
+#Sat Dec 09 11:24:20 NOVT 2023
 backgroundColor=2E3440
 barBorderColor=ECEFF4
 barColor=ECEFF4
--- a/kubejs/config/common.properties
+++ b/kubejs/config/common.properties
@ -1,5 +1,5 @@
 #KubeJS Common Properties
-#Tue Nov 28 16:58:19 NOVT 2023
+#Sat Dec 09 11:24:21 NOVT 2023
 allowAsyncStreams=true
 announceReload=true
 creativeModeTabIcon=minecraft\:purple_dye
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@ -52,20 +52,19 @@ TFCEvents.data(event => {
 * Срабатывает после инициализации датапаков.
 */
 ServerEvents.recipes(event => {
-    /*
-    registerMinecraftRecipes(event)
+    // registerMinecraftRecipes(event)
    registerTFCRecipes(event)
-    registerGTCEURecipes(event)
-    registerCreateRecipes(event)
-    registerAE2Recipes(event)
-    registerComputerCraftRecipes(event)
-    registerAdAstraRecipes(event)
-    registerTreeTapRecipes(event)
-    registerMoreRedRecipes(event)
-    registerSophisticatedBackpacksRecipes(event)
-    registerSmallShipsRecipes(event)
-    registerExtendedCraftingRecipes(event)
-    registerToolBeltRecipes(event)*/
+    // registerGTCEURecipes(event)
+    // registerCreateRecipes(event)
+    // registerAE2Recipes(event)
+    // registerComputerCraftRecipes(event)
+    // registerAdAstraRecipes(event)
+    // registerTreeTapRecipes(event)
+    // registerMoreRedRecipes(event)
+    // registerSophisticatedBackpacksRecipes(event)
+    // registerSmallShipsRecipes(event)
+    // registerExtendedCraftingRecipes(event)
+    // registerToolBeltRecipes(event)
 })

 /**
--- a/kubejs/server_scripts/tfc/data.js
+++ b/kubejs/server_scripts/tfc/data.js
@ -25,29 +25,29 @@ const registerTFCData = (event) => {
    )
 */
 const registerTFCMetals = (event) => {
-    event.metal('gtceu:tin', 230, 0.02143, null, null, null, 1)
-    event.metal('gtceu:bismuth', 270, 0.02143, null, null, null, 1)
-    event.metal('gtceu:zinc', 420, 0.01429, null, null, null, 1)
-    event.metal('gtceu:sterling_silver', 950, 0.00857, null, null, null, 1)
-    event.metal('gtceu:rose_gold', 960, 0.00857, null, null, null, 1)
-    event.metal('gtceu:silver', 961, 0.00625, null, null, null, 1)
-    event.metal('gtceu:gold', 1060, 0.005, null, null, null, 1)
-    event.metal('gtceu:copper', 1080, 0.00857, null, null, null, 1)
-    event.metal('gtceu:nickel', 1453, 0.00625, null, null, null, 1)
+    event.metal('gtceu:tin', 230, 0.02143, null, null, null, 1, 'tfg:tin')
+    event.metal('gtceu:bismuth', 270, 0.02143, null, null, null, 1, 'tfg:bismuth')
+    event.metal('gtceu:zinc', 420, 0.01429, null, null, null, 1, 'tfg:zinc')
+    event.metal('gtceu:sterling_silver', 950, 0.00857, null, null, null, 1, 'tfg:sterling_silver')
+    event.metal('gtceu:rose_gold', 960, 0.00857, null, null, null, 1, 'tfg:rose_gold')
+    event.metal('gtceu:silver', 961, 0.00625, null, null, null, 1, 'tfg:silver')
+    event.metal('gtceu:gold', 1060, 0.005, null, null, null, 1, 'tfg:gold')
+    event.metal('gtceu:copper', 1080, 0.00857, null, null, null, 1, 'tfg:copper')
+    event.metal('gtceu:nickel', 1453, 0.00625, null, null, null, 1, 'tfg:nickel')
    
-    event.metal('gtceu:brass', 930, 0.00857, null, null, null, 2)
-    event.metal('gtceu:bronze', 950, 0.00857, null, null, null, 2)
-    event.metal('gtceu:bismuth_bronze', 985, 0.00857, null, null, null, 2)
-    event.metal('gtceu:black_bronze', 1070, 0.00857, null, null, null, 2)
+    event.metal('gtceu:brass', 930, 0.00857, null, null, null, 2, 'tfg:brass')
+    event.metal('gtceu:bronze', 950, 0.00857, null, null, null, 2, 'tfg:bronze')
+    event.metal('gtceu:bismuth_bronze', 985, 0.00857, null, null, null, 2, 'tfg:bismuth_bronze')
+    event.metal('gtceu:black_bronze', 1070, 0.00857, null, null, null, 2, 'tfg:black_bronze')

-    event.metal('gtceu:iron', 1535, 0.00857, null, null, null, 3)
-    event.metal('gtceu:wrought_iron', 1535, 0.00857, null, null, null, 3)
+    event.metal('gtceu:iron', 1535, 0.00857, null, null, null, 3, 'tfg:iron')
+    event.metal('gtceu:wrought_iron', 1535, 0.00857, null, null, null, 3, 'tfg:wrought_iron')

-    event.metal('gtceu:steel', 1540, 0.00857, null, null, null, 4)
+    event.metal('gtceu:steel', 1540, 0.00857, null, null, null, 4, 'tfg:steel')

-    event.metal('gtceu:black_steel', 1485, 0.00857, null, null, null, 5)
-    event.metal('gtceu:blue_steel', 1540, 0.00857, null, null, null, 6)
-    event.metal('gtceu:red_steel', 1540, 0.00857, null, null, null, 6)
+    event.metal('gtceu:black_steel', 1485, 0.00857, null, null, null, 5, 'tfg:black_steel')
+    event.metal('gtceu:blue_steel', 1540, 0.00857, null, null, null, 6, 'tfg:blue_steel')
+    event.metal('gtceu:red_steel', 1540, 0.00857, null, null, null, 6, 'tfg:red_steel')
 }

 /**
--- a/kubejs/server_scripts/tfc/recipes.js
+++ b/kubejs/server_scripts/tfc/recipes.js
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@ -2,11 +2,10 @@

 const registerTFCItemTags = (event) => {
    
-    /*
    // Удаление тегов у откоюченных предметов
    global.TFC_DISABLED_ITEMS.forEach(item => {
        event.removeAllTagsFrom(item)
-    })*/
+    })

    // Тэги для возможности использования разных углей в кузне
    event.add('tfc:forge_fuel', 'minecraft:coal')
@ -90,6 +89,41 @@ const registerTFCBlockTags = (event) => {
 }

 const registerTFCFluidTags = (event) => {
+    event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth_bronze")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:black_bronze")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:bronze")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:brass")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:copper")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:gold")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:nickel")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:rose_gold")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:silver")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:tin")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:zinc")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:sterling_silver")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:wrought_iron")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:iron")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:steel")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:black_steel")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:blue_steel")
+    event.add('tfc:usable_in_ingot_mold', "gtceu:red_steel")
+
+    event.add('tfc:usable_in_bell_mold', "gtceu:bronze")
+    event.add('tfc:usable_in_bell_mold', "gtceu:gold")
+    event.add('tfc:usable_in_bell_mold', "gtceu:brass")
+
+    event.add('tfc:usable_in_tool_head_mold', "gtceu:copper")
+    event.add('tfc:usable_in_tool_head_mold', "gtceu:bismuth_bronze")
+    event.add('tfc:usable_in_tool_head_mold', "gtceu:black_bronze")
+    event.add('tfc:usable_in_tool_head_mold', "gtceu:bronze")
+
+    event.add('tfc:usable_in_pot', "gtceu:latex")
+
+    event.add('tfc:usable_in_barrel', "gtceu:latex")
+
+    event.add('tfc:usable_in_wooden_bucket', "gtceu:latex")
+
    event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote')
    event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote')
    event.add('tfc:usable_in_blue_steel_bucket', 'gtceu:creosote')
--- a/kubejs/startup_scripts/tfc/constants.js
+++ b/kubejs/startup_scripts/tfc/constants.js
@ -1664,7 +1664,6 @@ global.TFC_DISABLED_ITEMS = [
    "tfc:metal/ingot/rose_gold",
    "tfc:metal/ingot/sterling_silver",
    "tfc:metal/ingot/wrought_iron",
-    "tfc:metal/ingot/cast_iron",
    "tfc:metal/ingot/steel",
    "tfc:metal/ingot/black_steel",
    "tfc:metal/ingot/red_steel",
@ -1677,6 +1676,7 @@ global.TFC_DISABLED_ITEMS = [
    "tfc:metal/ingot/tin",
    "tfc:metal/ingot/zinc",
    
+    /*
    // Sheets
    "tfc:metal/sheets/bismuth",
    "tfc:metal/sheets/bismuth_bronze",
@ -2051,7 +2051,7 @@ global.TFC_DISABLED_ITEMS = [
    'tfc:metal/block/steel_slab', 
    'tfc:metal/block/black_steel_slab', 
    'tfc:metal/block/blue_steel_slab', 
-    'tfc:metal/block/red_steel_slab',
+    'tfc:metal/block/red_steel_slab',*/


 ];