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

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2026-01-27 21:16:22 +00:00
commit 18566753fd
19 changed files with 84 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/cereal_box/ingot",
"layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary",
"layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay"
}
}

9
kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json Normal file
View file

@ -0,0 +1,9 @@
{
"parent": "gtceu:item/material_sets/cereal_box/ingot",
"textures": {
"layer0": "gtceu:item/material_sets/cereal_box/ingot",
"layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary",
"layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay",
"layer3": "gtceu:item/material_sets/cereal_box/ingot_hot_overlay"
}
}

8
kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/noodle/ingot",
"layer1": "gtceu:item/material_sets/noodle/ingot_secondary",
"layer2": "gtceu:item/material_sets/noodle/ingot_overlay"
}
}

9
kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json Normal file
View file

@ -0,0 +1,9 @@
{
"parent": "gtceu:item/material_sets/noodle/ingot",
"textures": {
"layer0": "gtceu:item/material_sets/noodle/ingot",
"layer1": "gtceu:item/material_sets/noodle/ingot_secondary",
"layer2": "gtceu:item/material_sets/noodle/ingot_overlay",
"layer3": "gtceu:item/material_sets/noodle/ingot_hot_overlay"
}
}

6
kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "gtceu:item/material_sets/metallic/ingot_hot",
"textures": {
"layer1": "gtceu:item/material_sets/radioactive/ingot_secondary"
}
}

BIN
kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 487 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 667 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 405 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 504 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 490 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 639 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 404 B

BIN
kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_secondary.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 565 B

12
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json
View file

@ -12,6 +12,15 @@
"type": "patchouli:text",
"text": "In addition to finding wild crops, seeds can also be produced from existing crops. When a fully mature crop dies - either by weather, or leaving it to rot - it will go to seed, dropping more seeds that can be used to grow even more crops next season."
},
{
"type": "patchouli:text",
"title": "Contents",
"text": "$(li)$(l:tfc:mechanics/crops#barley)Barley$()$(li)$(l:tfc:mechanics/crops#beet)Beet$()$(li)$(l:tfc:mechanics/crops#cabbage)Cabbage$()$(li)$(l:tfc:mechanics/crops#canola)Canola$()$(li)$(l:tfc:mechanics/crops#carrot)Carrot$()$(li)$(l:tfc:mechanics/crops#flax)Flax$()$(li)$(l:tfc:mechanics/crops#garlic)Garlic$()$(li)$(l:tfc:mechanics/crops#green_bean)Green Bean$()$(li)$(l:tfc:mechanics/crops#jute)Jute$()$(li)$(l:tfc:mechanics/crops#maize)Maize$()$(li)$(l:tfc:mechanics/crops#melon)Melon$()$(li)$(l:tfc:mechanics/crops#oat)Oat$()$(li)$(l:tfc:mechanics/crops#onion)Onion$()"
},
{
"type": "patchouli:text",
"text": "$(li)$(l:tfc:mechanics/crops#papyrus)Papyrus$()$(li)$(l:tfc:mechanics/crops#potato)Potato$()$(li)$(l:tfc:mechanics/crops#pumpkin)Pumpkin$()$(li)$(l:tfc:mechanics/crops#red_bell_pepper)Red Bell Pepper$()$(li)$(l:tfc:mechanics/crops#rice)Rice$()$(li)$(l:tfc:mechanics/crops#rye)Rye$()$(li)$(l:tfc:mechanics/crops#soybean)Soybean$()$(li)$(l:tfc:mechanics/crops#squash)Squash$()$(li)$(l:tfc:mechanics/crops#sugarcane)Sugarcane$()$(li)$(l:tfc:mechanics/crops#sunflower)Sunflower$()$(li)$(l:tfc:mechanics/crops#tomatoes)Tomato$()$(li)$(l:tfc:mechanics/crops#wheat)Wheat$()$(li)$(l:tfc:mechanics/crops#yellow_bell_pepper)Yellow Bell Pepper$()"
},
{
"type": "tfc:rock_knapping_recipe",
"recipes": [
@ -3298,6 +3307,7 @@
},
{
"type": "patchouli:text",
"anchor": "sunflower",
"text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): 5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 20 - 80 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)A Sunflower is a two block tall crop. Sunflower seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Sunflower Caps$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)A Sunflower also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().",
"title": "Sunflower"
},
@ -3456,6 +3466,7 @@
},
{
"type": "patchouli:text",
"anchor": "canola",
"text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 10 - 60 %$(br)$(bold)Nutrient$(): Phosphorus$(br2)Canola is a two block tall crop. Canola seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Canola Ovules$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)Canola also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().",
"title": "Canola"
},
@ -3615,6 +3626,7 @@
},
{
"type": "patchouli:text",
"anchor": "flax",
"text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -8 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 15 - 65 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)Flax is a two block tall crop. Flax seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Flax Stems$() which can be processed into $(thing)Linen$() or $(thing)Burlap$().$(br)Flax also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().",
"title": "Flax"
},

6
kubejs/server_scripts/tfc/data.js
View file

@ -109,6 +109,10 @@ const registerTFCFertilizers = (event) => {
event.fertilizer('gtceu:tiny_ammonium_chloride_dust', 0.03, null, null)
event.fertilizer('gtceu:small_ammonium_chloride_dust', 0.075, null, null)
event.fertilizer('gtceu:ammonium_chloride_dust', 0.3, null, null)
event.fertilizer('tfc:pure_nitrogen', 1, null, null)
event.fertilizer('tfc:pure_phosphorus', null, 1, null)
event.fertilizer('tfc:pure_potassium', null, null, 1)
}
@ -117,4 +121,4 @@ const registerTFCFertilizers = (event) => {
const registerTFCKnappingTypes = (event) => {
event.knappingType('minecraft:flint', 1, 1, 'tfc:item.knapping.stone', true, false, true, 'minecraft:flint', 'tfg:flint')
event.knappingType('tfc:straw', 4, 4, 'tfc:item.knapping.leather', false, false, false, 'tfc:straw', 'tfg:straw')
}
}

24
kubejs/server_scripts/tfg/primitive/recipes.compost.js
View file

@ -22,21 +22,33 @@ function registerTFGCompostRecipes(event) {
.EUt(30)
event.recipes.gtceu.centrifuge('tfg:gtceu/centrifuge/pure_fertilizers')
.itemInputs('1x gtceu:fertilizer')
.itemInputs('8x gtceu:fertilizer')
.itemOutputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus')
.duration(340)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.mixer('tfg:tfc/mixer/fertilizer')
.itemInputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1))
.itemInputs('8x tfc:pure_nitrogen', '8x tfc:pure_potassium', '8x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1))
.itemOutputs('1x gtceu:fertilizer')
.duration(160)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.gas_pressurizer('tfg:pure_nitrogen')
event.recipes.gtceu.mixer('tfg:pure_nitrogen')
.itemInputs('#forge:wax')
.inputFluids(Fluid.of('gtceu:nitrogen', 1000))
.itemOutputs('16x tfc:pure_nitrogen')
.inputFluids(Fluid.of('gtceu:nitrogen', 8000))
.itemOutputs('4x tfc:pure_nitrogen')
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.mixer('tfg:pure_potassium')
.itemInputs('#forge:wax', '8x gtceu:potassium_dust')
.itemOutputs('4x tfc:pure_potassium')
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.mixer('tfg:pure_phosphorus')
.itemInputs('#forge:wax', '8x gtceu:phosphorus_dust')
.itemOutputs('4x tfc:pure_phosphorus')
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
//#endregion
@ -191,4 +203,4 @@ function registerTFGCompostRecipes(event) {
.itemOutputs(Item.of('tfg:universal_compost_browns', 4))
.duration(20)
.EUt(8)
}
}

4
kubejs/startup_scripts/gtceu/material_modification.js
View file

@ -427,8 +427,8 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Cobalt.setMaterialSecondaryARGB(0x1D2688)
GTMaterials.CertusQuartz.setMaterialARGB(0xB8D8FC)
GTMaterials.CertusQuartz.setMaterialSecondaryARGB(0xADCCEF)
GTMaterials.Vanadium.setMaterialARGB(0xD8D4E7)
GTMaterials.Vanadium.setMaterialSecondaryARGB(0x7E988F)
GTMaterials.Vanadium.setMaterialARGB(0xA7AAC6)
GTMaterials.Vanadium.setMaterialSecondaryARGB(0xC4EFE6)
GTMaterials.Brass.setMaterialSecondaryARGB(0x791905)
GTMaterials.Aluminium.setMaterialARGB(0xb6e5ff)
GTMaterials.Aluminium.setMaterialSecondaryARGB(0x7ca29b)

5
kubejs/startup_scripts/tfg/icon_sets.js
View file

@ -37,6 +37,9 @@ function registerTFGIconSets(event) {
event.create('nether_quartz').parent('quartz')
event.create('noodle').parent('metallic')
event.create('cereal_box').parent('bright')
// Credits to Flare from the Cosmic Frontiers team
event.create('chonky').parent('shiny')
}
@ -152,6 +155,8 @@ function modifyTFGIconSets(event) {
GTMaterials.Zirconium.setMaterialIconSet(GTMaterialIconSet.getByName('chonky'))
GTMaterials.Vanadium.setMaterialIconSet(GTMaterialIconSet.getByName('noodle'))
const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
$GreateMaterials.RoseQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz'))
}

4
kubejs/startup_scripts/tfg/mars/materials.mars.js
View file

@ -81,7 +81,7 @@ function registerTFGMarsMaterials(event) {
.components('2x pitchblende', '1x tricalcium_phosphate', '1x bauxite', '1x silver', '1x beryllium')
.color(0xbd7980)
.secondaryColor(0xA66C8D)
.iconSet(GTMaterialIconSet.getByName('tfc_cassiterite'))
.iconSet(GTMaterialIconSet.getByName('cereal_box'))
.ingot()
.liquid()
.blastTemp(3700, 'mid', GTValues.VA[GTValues.EV])
@ -99,7 +99,7 @@ function registerTFGMarsMaterials(event) {
.liquid()
.components('2x ostrum', 'iodine')
.blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120))
.iconSet(GTMaterialIconSet.BRIGHT)
.iconSet(GTMaterialIconSet.getByName('cereal_box'))
.flags(GTMaterialFlags.GENERATE_GEAR)
.color(0xc696f2)
.secondaryColor(0x9b99ff)