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 2025-04-20 14:48:13 +01:00
commit cb1a7a9230
5 changed files with 576 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

45
defaultconfigs/tfcastikorcarts-common.toml Normal file
View file

@ -0,0 +1,45 @@
[general]
#
# Max animal size that the animal cart can carry.
#Range: 0.0 ~ 1.7976931348623157E308
maxAnimalSize = 3.0
#
# Amount of animals the animal cart can carry.
#Range: > 0
maxPassengerCount = 2
#
# The largest (inclusive) size of an item that is allowed in a supply cart.
#Allowed Values: TINY, VERY_SMALL, SMALL, NORMAL, LARGE, VERY_LARGE, HUGE
maxItemSize = "HUGE"
#
# Can the animal cart pick up players by pushing it into them?
canPushIntoPlayers = true
#
# Can the animal cart pick up water animals?
canCarryWaterEntities = true
#
# Pulling distance modifier for carts. Higher => farther/greater break tolerance.
#Range: 4.9E-324 ~ 1.7976931348623157E308
pullingDistanceModifier = 2.0
#
# Should the player's average nutrient level and thirst affect the pulling speed of carts?
toggleFoodSpeed = true
#
# A very heavy huge item has a combined weight/size factor of 35, thus if a threshold is 140, then the player can carry 4 items.
# Threshold at which the player carrying a cart will get exhausted. Higher => can carry more.
#Range: 0.0 ~ 1.7976931348623157E308
exhaustedThreshold = 140.0
#
# Threshold at which the player carrying a cart will get overburdened. Higher => can carry more.
#Range: 0.0 ~ 1.7976931348623157E308
overburdenedThreshold = 280.0
#
# Threshold at which the player carrying a cart will get pinned. Higher => can carry more.
#Range: 0.0 ~ 1.7976931348623157E308
pinnedThreshold = 420.0
#
# How big the supply cart inventory should be.
#Allowed Values: SIZE_0, SIZE_1, SIZE_2, SIZE_3, SIZE_4, SIZE_5, SIZE_6, SIZE_7, SIZE_8, SIZE_9, SIZE_10, SIZE_11, SIZE_12, SIZE_13
supplyCartInventorySize = "SIZE_6"

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

@ -177,7 +177,7 @@ const registerAFCRecipes = (event) => {
.duration(300)
.EUt(2)
event.replaceOutput({ id: 'gtceu:centrifuge/sticky_resin_separation' }, 'gtceu:raw_rubber_dust', 'gtceu:carbon_dust')
event.replaceOutput({ id: 'gtceu:centrifuge/sticky_resin_separation' }, 'gtceu:raw_rubber_dust', '3x gtceu:carbon_dust')
//#endregion

871
kubejs/server_scripts/gregtech/recipes.materials.js
View file

File diff suppressed because it is too large Load diff

5
kubejs/server_scripts/tfc/recipes.materials.js
View file

@ -579,11 +579,6 @@ function registerTFCMaterialsRecipes(event) {
.useDurability(true)
.id(`rnr:heating/metal/${material.getName()}_mattock`)
// event.recipes.tfc.anvil(`rnr:metal/mattock_head/${material.getName()}`, ingotItem, ['punch_last', 'punch_not_last', 'draw_not_last'])
// .tier(tfcProperty.getTier())
// .bonus(true)
// .id(`rnr:anvil/${material.getName()}_mattock_head`)
event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
.id(`rnr:heating/metal/${material.getName()}_mattock_head`)

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

@ -489,6 +489,7 @@ function registerVintageImprovementsRecipes(event) {
// #region Curving Press
// Copied from https://github.com/ThePansmith/Monifactory/blob/15c109298104e0c0b5083b266264bd6c158c6154/kubejs/server_scripts/mods/optionalCompats/create.js#L251
event.forEachRecipe([{ type: 'gtceu:extruder' }],
recipe => {
let r = JSON.parse(recipe.json)
@ -517,60 +518,6 @@ function registerVintageImprovementsRecipes(event) {
// #endregion
// #region Centrifuge
// Copied from https://github.com/ThePansmith/Monifactory/blob/15c109298104e0c0b5083b266264bd6c158c6154/kubejs/server_scripts/mods/optionalCompats/create.js#L251
event.forEachRecipe([{ type: 'gtceu:centrifuge' }],
recipe => {
let r = JSON.parse(recipe.json)
// ULV recipes only
let EUt = (r.tickInputs && r.tickInputs.eu) ? r.tickInputs.eu[0].content : null;
if (!(EUt <= 8)) { return }
let inputs = [];
if (r.inputs.item) {
r.inputs.item.forEach(i => {
let ins = i.content.ingredient;
if (i.content.count)
ins.count = i.content.count;
inputs.push(ins)
})
}
else return;
let outputs = [];
if (r.outputs.item) {
r.outputs.item.forEach(i => {
let out = i.content.ingredient;
if (i.content.count)
out.count = i.content.count;
if (i.chance != 0 && i.chance != 10000)
out.chance = i.chance / 10000;
outputs.push(out)
})
}
else return;
event.custom({
type: 'vintageimprovements:centrifugation',
ingredients: inputs,
results: outputs,
processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/${recipe.getId().split(':')[1]}`)
}
)
// Fix weird inconsistency
event.replaceOutput({ id: 'tfg:vi/centrifuge/sticky_resin_separation' }, 'gtceu:raw_rubber_dust', 'gtceu:carbon_dust')
// #endregion
// #region Vacuum
event.custom({