illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/food

Browse source
This commit is contained in:
Pyritie 2025-06-12 13:27:17 +01:00
commit c83dae8b7d
12 changed files with 149 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json
View file

@ -47,7 +47,7 @@
"title": "Hevea",
"item": "afc:wood/log/hevea,afc:wood/wood/hevea,afc:wood/leaves/hevea,afc:wood/sapling/hevea",
"link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 22°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb"
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 8°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb"
},
{
"type": "patchouli:image",
@ -61,7 +61,7 @@
"title": "Rubber Fig",
"item": "afc:wood/log/rubber_fig,afc:wood/wood/rubber_fig,afc:wood/leaves/rubber_fig,afc:wood/sapling/rubber_fig",
"link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb"
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 4°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb"
},
{
"type": "patchouli:image",
@ -75,7 +75,7 @@
"title": "Kapok",
"item": "tfc:wood/log/kapok,tfc:wood/wood/kapok,tfc:wood/leaves/kapok,tfc:wood/sapling/kapok",
"link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 1°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb"
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb"
},
{
"type": "patchouli:image",

4
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json
View file

@ -18,11 +18,11 @@
{
"type": "patchouli:text",
"title": "Trade Results",
"text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)4-6 Sulfur Powder"
"text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)1 Cinnabar Gem"
},
{
"type": "patchouli:text",
"text": "$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks"
"text": "$(li)4-6 Sulfur Powder$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks"
},
{
"type": "patchouli:text",

2
kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json
View file

@ -31,7 +31,7 @@
"function": "minecraft:set_count"
}
],
"name": "gtceu:raw_coal"
"name": "tfc:ore/normal_native_gold"
},
{
"type": "minecraft:item",

5
kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json
View file

@ -115,6 +115,11 @@
"name": "gtceu:nickel_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:cinnabar_gem",
"weight": 100
},
{
"type": "minecraft:item",
"name": "minecraft:leather",

41
kubejs/server_scripts/afc/recipes.js
View file

@ -86,39 +86,36 @@ const registerAFCRecipes = (event) => {
.id('tfg:heating/tree_tap')
//Custom rubber and hevea tappings
//Hevea is the most efficient but requires the warmest temperatures
//Rubber fig requires average temperatures and its mildly efficient
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(22)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(22)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/rubber_fig"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(12)
.resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(4)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/rubber_fig")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_rubber_fig"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(12)
.resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(4)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_rubber_fig")
//Kapok Grandfathered, least efficient but works as long as the temperature is not freezing
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/kapok"))
.resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(1)
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(12)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/kapok_latex")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok"))
.resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(1)
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(12)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/ancient_kapok_latex")

9
kubejs/server_scripts/greate/recipes.js
View file

@ -186,18 +186,19 @@ function registerGreateRecipes(event) {
event.shaped('greate:steel_millstone', [
'FBF',
'DCE',
'AAA'
'AGA'
], {
A: '#forge:smooth_stone',
B: 'gtceu:treated_wood_slab',
C: '#forge:small_gears/wrought_iron',
C: '#forge:small_gears/steel',
D: '#forge:tools/hammers',
E: '#forge:tools/wrenches',
F: '#forge:dusts/diamond'
F: '#forge:dusts/diamond',
G: 'greate:steel_shaft'
}).id('greate:shaped/steel_millstone')
event.recipes.gtceu.assembler('greate:steel_millstone')
.itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/wrought_iron', '2x #forge:dusts/diamond')
.itemInputs('2x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/steel', '2x #forge:dusts/diamond', 'greate:steel_shaft')
.itemOutputs('greate:steel_millstone')
.duration(200)
.EUt(GTValues.VA[GTValues.ULV])

13
kubejs/server_scripts/greate/recipes.recycling.js
View file

@ -103,19 +103,20 @@ function registerGreateRecyclingRecipes(event) {
event.recipes.gtceu.macerator('greate:steel_millstone')
.itemInputs('greate:steel_millstone')
.itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1),
ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 10),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Stone, 2),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2),
ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2))
.duration(GTMaterials.Steel.getMass() * 4)
.duration(GTMaterials.Stone.getMass() * 4)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace('greate:steel_millstone')
.itemInputs('greate:steel_millstone')
.itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1))
.duration(GTMaterials.Steel.getMass() * 4)
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 10),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2))
.duration(GTMaterials.Stone.getMass() * 4)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])

10
kubejs/server_scripts/tfclunchbox/recipes.js
View file

@ -46,14 +46,14 @@ function registerTFCLunchBoxRecipes(event) {
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice')
.itemInputs('tfclunchbox:universal_capsule')
.inputFluids(Fluid.of('gtceu:ice', 144))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.inputFluids(Fluid.of('gtceu:ice', 45 * 144))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid')
.itemInputs('tfclunchbox:universal_capsule', 'minecraft:ice')
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice')
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
}
}

6
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -575,21 +575,21 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:latex_logs' }],
results: [{ fluid: 'tfg:latex', amount: 250 }],
results: [{ fluid: 'tfg:latex', amount: 100 }],
processingTime: 600
}).id('tfg:vi/vacuumizing/latex_from_rubber_logs')
event.custom({
type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:rubber_saplings' }],
results: [{ fluid: 'tfg:latex', amount: 100 }],
results: [{ fluid: 'tfg:latex', amount: 25 }],
processingTime: 300
}).id('tfg:vi/vacuumizing/latex_from_rubber_sapling')
event.custom({
type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:rubber_leaves' }],
results: [{ fluid: 'tfg:latex', amount: 50 }],
results: [{ fluid: 'tfg:latex', amount: 10 }],
processingTime: 150
}).id('tfg:vi/vacuumizing/latex_from_rubber_leaves')