diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index a9bbbd31c..ad836a083 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -1,4 +1,16 @@ { + "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", + "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", + "item.gtceu.wood_dust": "Softwood Pulp", + + "item.gtceu.tiny_hardwood_dust": "Tiny Pile of Hardwood Pulp", + "item.gtceu.small_hardwood_dust": "Small Pile of Hardwood Pulp", + "item.gtceu.hardwood_dust": "Hardwood Pulp", + + "item.gtceu.tiny_thermochemically_treated_hardwood_dust": "Tiny Pile of Thermochemicall Treated Hardwood Pulp", + "item.gtceu.small_thermochemically_treated_hardwood_dust": "Small Pile of Thermochemicall Treated Hardwood Pulp", + "item.gtceu.thermochemically_treated_hardwood_dust": "Thermochemically Treated Hardwood Pulp", + "gtceu.jei.bedrock_fluid.tfc_salt_water_deposit": "Sea Water Deposit", "block.gtceu.greenhouse": "Electric Greenhouse", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 1085824a8..65ef6553a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1,6 +1,7 @@ { "material.tfg.latex": "Latex", "material.tfg.fluix": "Fluix", + "material.gtceu.thermochemically_treated_hardwood": "Thermochemically Treated Hardwood", "material.gtceu.hardwood": "Hardwood", "item.tfg.hardwood_strip": "Hardwood Strip", diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index e3c64a36d..437c83c53 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,8 +1,33 @@ // priority: 0 const registerGTCEURecipes = (event) => { - //#region Выход: Удобрение + + //#region Hardwood Dust from Hardwood + //Lathe - Replace regular logs tag with softwood tag + event.replaceInput({id: 'gtceu:lathe/lathe_logs'}, '#minecraft:logs', '#tfg:softwood') + //Create identical lathe recipe for hardwood + event.recipes.gtceu.lathe('lathe_hardwood') + .itemInputs('#tfg:hardwood') + .itemOutputs('4x gtceu:long_wood_rod', '2x gtceu:hardwood_dust') + .duration(160) + .EUt(7) + //Replace any recipe that outputs wood dust to use hardwood dust if it's ID string contains the name of one of the hardwood types. + //This absolutely fuckin sucks but it works + event.forEachRecipe({output: 'gtceu:wood_dust'}, r =>{ + global.TFC_HARDWOOD_TYPES.forEach(hardwoodType => + { + if(r.id.toString().includes(hardwoodType)) + { + r.replaceOutput('gtceu:wood_dust', 'gtceu:hardwood_dust') + r.replaceOutput('gtceu:small_wood_dust', 'gtceu:small_hardwood_dust') + r.replaceOutput('gtceu:tiny_wood_dust', 'gtceu_tiny_hardwood_dust') + return; + } + }) + }) + + //#region Выход: Удобрение // В обычном миксере event.recipes.gtceu.mixer('fertilizer') .itemInputs( diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 22338e50d..69bdd6317 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -140,6 +140,7 @@ ServerEvents.recipes(event => { registerSophisticatedBackpacksRecipes(event) registerTfceaRecipes(event) registerTFCRecipes(event) + registerTFGRecipes(event) registerTFCGroomingStationRecipes(event) registerToolBeltRecipes(event) registerTreeTapRecipes(event) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 65671d769..dc8488ab3 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -86,6 +86,20 @@ const registerTFCItemTags = (event) => { event.add('tfg:bladed_axles', `tfc:wood/bladed_axle/${woodType}`) }) + //Hardwood Tags + global.TFC_HARDWOOD_TYPES.forEach(woodType => { + event.add('tfg:hardwood', `#tfc:${woodType}_logs`) + event.add('tfg:stripped_hardwood', `tfc:wood/stripped_log/${woodType}`) + event.add('tfg:stripped_hardwood', `tfc:wood/stripped_wood/${woodType}`) + }); + + //Softwood Tags + global.TFC_SOFTWOOD_TYPES.forEach(woodType =>{ + event.add('tfg:softwood', `#tfc:${woodType}_logs`) + event.add('tfg:stripped_softwood', `tfc:wood/stripped_log/${woodType}`) + event.add('tfg:stripped_softwood', `tfc:wood/stripped_wood/${woodType}`) + }) + // Теги для сосудов по цветам global.MINECRAFT_DYE_NAMES.forEach(dye => { event.add('tfg:colorized_unfired_vessels', `tfc:ceramic/${dye}_unfired_vessel`) diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index e69de29bb..1662033c1 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -0,0 +1,4 @@ +const registerTFGRecipes = (event) => +{ + event.recipes.tfc.damage_inputs_shapeless_crafting(event.shapeless('4x tfg:hardwood_strip', ['#minecraft:axes', '#tfg:stripped_hardwood'])) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 5b91aaa30..b7fb4e32e 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -707,6 +707,32 @@ global.TFC_WOOD_TYPES = [ "willow" ]; +global.TFC_HARDWOOD_TYPES = [ + "acacia", + "ash", + "aspen", + "birch", + "blackwood", + "chestnut", + "hickory", + "maple", + "oak", + "rosewood", + "sycamore" +]; + +global.TFC_SOFTWOOD_TYPES = [ + "douglas_fir", + "kapok", + "mangrove", + "palm", + "pine", + "sequoia", + "spruce", + "white_cedar", + "willow" +]; + global.TFC_MUD_TYPES = [ 'silt', 'loam',