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

Now works with gtceu 1.1.0

Browse source
This commit is contained in:
Dmitry 2024-01-18 11:06:50 +07:00
parent 7ce1f2e598
commit 756a0eee96
15 changed files with 271 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/ftbquests/quests/chapters/iv__insane_voltage.snbt
View file

@ -501,7 +501,7 @@
""
"&6This quest unlocks a definitive tutorial on Ore Processing in the &lTips and Tricks&r&6 tab - check it out to learn more!&r"
]
icon: "gtceu:almandine_refined_ore"
icon: "gtceu:refined_almandine_ore"
id: "724FB950CC472BB4"
shape: "circle"
size: 0.66d

2
config/ftbquests/quests/chapters/lv__low_voltage.snbt
View file

@ -749,7 +749,7 @@
""
"&cNote:&r Don't get too preoccupied with Ore Processing! It's very slow at this point, and somewhat power hungry. Around 90% of ores are not important enough to warrant going out of your way to obtain their byproducts. That's a legitimate stat, by the way."
]
icon: "gtceu:sulfur_crushed_ore"
icon: "gtceu:crushed_sulfur_ore"
id: "701BCADAE5CF6CA5"
shape: "circle"
size: 0.66d

2
config/ftbquests/quests/chapters/primitive_age.snbt
View file

@ -3126,7 +3126,7 @@
ticks: 0L
}
}
id: "gtceu:wrought_iron_double_plate"
id: "gtceu:double_wrought_iron_plate"
}
type: "item"
}]

2
config/ftbquests/quests/chapters/steam_age.snbt
View file

@ -605,7 +605,7 @@
""
"&6This quest unlocks a new tutorial on rudimentary Ore Processing in the &lTips and Tricks&r&6 tab - check it out to learn more!&r"
]
icon: "gtceu:gold_crushed_ore"
icon: "gtceu:crushed_gold_ore"
id: "7813F183681E0342"
shape: "circle"
size: 1.0d

4
config/gtceu.yaml
View file

@ -1,11 +1,11 @@
recipes:
# Whether to generate Flawed and Chipped Gems for materials and recipes involving them.
# Useful for mods like TerraFirmaCraft.
# Default: false
# Default: true
generateLowQualityGems: true
# Whether to remove Block/Ingot compression and decompression in the Crafting Table.
# Default: false
# Default: true
disableManualCompression: true
# Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods.

1
config/jade/plugins.json
View file

@ -100,6 +100,7 @@
"chested_horse": true,
"pack_predator": true,
"barrel": true,
"mold_table": true,
"predator": true,
"wild_animal": true,
"crucible": true,

4
config/jade/sort-order.json
View file

@ -146,6 +146,7 @@
"tfc:water_wheel": null,
"tfc:windmill": null,
"minecraft:campfire": null,
"tfc:mold_table": null,
"corpse:corpse": null,
"create:blaze_burner": null,
"create:backtank_capacity": null,
@ -278,5 +279,6 @@
"firmalife:vat": null,
"firmalife:tumbler": null,
"firmalife:fruit_tree_sapling": null,
"firmalife:jarbnet": null
"firmalife:jarbnet": null,
"tfc:mold_table": null
}

6
config/playerrevive.json
View file

@ -10,7 +10,8 @@
{
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 10
"duration": 10,
"hideParticles": false
}
],
"affectHunger": true,
@ -35,7 +36,8 @@
{
"effect": "minecraft:slowness",
"amplifier": 2,
"duration": 1
"duration": 1,
"hideParticles": false
}
],
"reviveItem": "{id:\"item\",item:\"minecraft:paper\"}",

2
kubejs/server_scripts/computer_craft/data.js
View file

@ -32,7 +32,7 @@ const registerComputerCraftData = (event) => {
break;
}
event.addJson(`computercraft:computercraft/turtle_upgrades/${material}_${type.name}`, json)
event.addJson(`computercraft:computercraft/turtle_upgrades/${material.getName()}_${type.name}`, json)
}
})
});

25
kubejs/server_scripts/gregtech/constants.js Normal file
View file

@ -0,0 +1,25 @@
// priority: 0
global.GTCEU_ANVIL_TOOL_TYPES = [
GTToolType.SWORD,
GTToolType.PICKAXE,
GTToolType.SHOVEL,
GTToolType.AXE,
GTToolType.HOE,
GTToolType.MINING_HAMMER,
GTToolType.SPADE,
GTToolType.SAW,
GTToolType.HARD_HAMMER,
// GTToolType.SOFT_MALLET,
// GTToolType.WRENCH,
GTToolType.FILE,
// GTToolType.CROWBAR,
// GTToolType.SCREWDRIVER,
// GTToolType.MORTAR,
// GTToolType.WIRE_CUTTER,
GTToolType.SCYTHE,
GTToolType.KNIFE,
GTToolType.BUTCHERY_KNIFE,
// GTToolType.PLUNGER
];

2
kubejs/server_scripts/gregtech/loot.js
View file

@ -15,7 +15,7 @@ const registerGTCEULoots = (event) => {
let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1)
let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1).withChance(0.2)
let blockName = `gtceu:${stoneType}_${material}_ore`
let blockName = `gtceu:${stoneType}_${material.getName()}_ore`
if (!richRawOre.isEmpty() && !normalRawOre.isEmpty() && !poorRawOre.isEmpty()) {

68
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1275,9 +1275,9 @@ const registerGTCEURecipes = (event) => {
'A',
'B'
], {
A: `gtceu:${material}_${toolType.name}_head`,
A: `gtceu:${material.getName()}_${toolType.name}_head`,
B: '#forge:rods/wooden'
}, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
}, 0, 0).id(`gtceu:shaped/${toolType.name}_${material.getName()}`)
})
}
@ -1287,31 +1287,31 @@ const registerGTCEURecipes = (event) => {
if (material.hasProperty(PropertyKey.ORE))
{
// Бедная сырая руда -> Дробленная руда + Дробленная руда (30%)
event.recipes.createCrushing(Item.of(`gtceu:${material}_crushed_ore`).withChance(0.75), `#forge:poor_raw_materials/${material}`)
event.recipes.createCrushing(Item.of(`gtceu:${material.getName()}_crushed_ore`).withChance(0.75), `#forge:poor_raw_materials/${material.getName()}`)
.processingTime(200)
.id(`tfg:crushing/${material}_crushed_ore_from_poor_raw_ore`)
.id(`tfg:crushing/${material.getName()}_crushed_ore_from_poor_raw_ore`)
// Нормальная сырая руда -> Дробленная руда + Дробленная руда (30%)
event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.2)], `#forge:raw_materials/${material}`)
event.recipes.createCrushing([`gtceu:${material.getName()}_crushed_ore`, Item.of(`gtceu:${material.getName()}_crushed_ore`).withChance(0.2)], `#forge:raw_materials/${material.getName()}`)
.processingTime(200)
.id(`tfg:crushing/${material}_crushed_ore_from_normal_raw_ore`)
.id(`tfg:crushing/${material.getName()}_crushed_ore_from_normal_raw_ore`)
// Богатая сырая руда -> Дробленная руда + Дробленная руда (30%)
event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, `gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.2)], `#forge:rich_raw_materials/${material}`)
event.recipes.createCrushing([`gtceu:${material.getName()}_crushed_ore`, `gtceu:${material.getName()}_crushed_ore`, Item.of(`gtceu:${material.getName()}_crushed_ore`).withChance(0.2)], `#forge:rich_raw_materials/${material.getName()}`)
.processingTime(200)
.id(`tfg:crushing/${material}_crushed_ore_from_rich_raw_ore`)
.id(`tfg:crushing/${material.getName()}_crushed_ore_from_rich_raw_ore`)
// Грязная пыль -> Пыль (90%)
event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_impure_dust`)
.id(`tfg:splashing/${material}_dust_from_impure`)
event.recipes.createSplashing(Item.of(`#forge:dusts/${material.getName()}`).withChance(0.9), `gtceu:${material.getName()}_impure_dust`)
.id(`tfg:splashing/${material.getName()}_dust_from_impure`)
// Очищенная пыль -> Пыль (90%)
event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_pure_dust`)
.id(`tfg:splashing/${material}_dust_from_pure`)
event.recipes.createSplashing(Item.of(`#forge:dusts/${material.getName()}`).withChance(0.9), `gtceu:${material.getName()}_pure_dust`)
.id(`tfg:splashing/${material.getName()}_dust_from_pure`)
// Дробленная руда -> Очищенная руда (90%)
event.recipes.createSplashing(Item.of(`#forge:purified_ores/${material}`).withChance(0.9), `gtceu:${material}_crushed_ore`)
.id(`tfg:splashing/${material}_purified_ore`)
event.recipes.createSplashing(Item.of(`#forge:purified_ores/${material.getName()}`).withChance(0.9), `gtceu:${material.getName()}_crushed_ore`)
.id(`tfg:splashing/${material.getName()}_purified_ore`)
// Грязная пыль -> Пыль
event.custom({
@ -1322,11 +1322,11 @@ const registerGTCEURecipes = (event) => {
},
ingredients: [
{
item: `gtceu:${material}_impure_dust`
item: `gtceu:${material.getName()}_impure_dust`
}
],
result: Item.of(`#forge:dusts/${material}`).toJson()
}).id(`tfg:ae_transform/${material}_dust_from_impure`)
result: Item.of(`#forge:dusts/${material.getName()}`).toJson()
}).id(`tfg:ae_transform/${material.getName()}_dust_from_impure`)
// Очищенная пыль -> Пыль
event.custom({
@ -1337,11 +1337,11 @@ const registerGTCEURecipes = (event) => {
},
ingredients: [
{
item: `gtceu:${material}_pure_dust`
item: `gtceu:${material.getName()}_pure_dust`
}
],
result: Item.of(`#forge:dusts/${material}`).toJson()
}).id(`tfg:ae_transform/${material}_dust_from_pure`)
result: Item.of(`#forge:dusts/${material.getName()}`).toJson()
}).id(`tfg:ae_transform/${material.getName()}_dust_from_pure`)
// Дробленная руда -> Очищенная руда
event.custom({
@ -1352,11 +1352,11 @@ const registerGTCEURecipes = (event) => {
},
ingredients: [
{
item: `gtceu:${material}_crushed_ore`
item: `gtceu:${material.getName()}_crushed_ore`
}
],
result: Item.of(`#forge:purified_ores/${material}`).toJson()
}).id(`tfg:ae_transform/${material}_purified_ore`)
result: Item.of(`#forge:purified_ores/${material.getName()}`).toJson()
}).id(`tfg:ae_transform/${material.getName()}_purified_ore`)
}
if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && (material != 'wood' || material != 'treated_wood'))
@ -1364,19 +1364,19 @@ const registerGTCEURecipes = (event) => {
if (material.hasProperty(PropertyKey.INGOT))
{
// Слиток -> Стержень
event.recipes.createPressing(Item.of(`gtceu:${material}_plate`).withChance(0.97), `#forge:ingots/${material}`)
.id(`tfg:pressing/${material}_plate`)
event.recipes.createPressing(Item.of(`gtceu:${material.getName()}_plate`).withChance(0.97), `#forge:ingots/${material.getName()}`)
.id(`tfg:pressing/${material.getName()}_plate`)
// 9х Слиток -> Блок
event.recipes.createCompacting(Item.of(`#forge:storage_blocks/${material}`), `9x #forge:ingots/${material}`)
event.recipes.createCompacting(Item.of(`#forge:storage_blocks/${material.getName()}`), `9x #forge:ingots/${material.getName()}`)
.heated()
.id(`tfg:compacting/${material}_block`)
.id(`tfg:compacting/${material.getName()}_block`)
}
else
{
// Блок из гемов -> 9 Пластин
event.recipes.createCutting(Item.of(`9x gtceu:${material}_plate`).withChance(0.65), `#forge:storage_blocks/${material}`)
.id(`tfg:cutting/${material}_plate`)
event.recipes.createCutting(Item.of(`9x gtceu:${material.getName()}_plate`).withChance(0.65), `#forge:storage_blocks/${material.getName()}`)
.id(`tfg:cutting/${material.getName()}_plate`)
}
}
@ -1388,13 +1388,13 @@ const registerGTCEURecipes = (event) => {
event.custom({
type: "createaddition:rolling",
input: {
'tag': `forge:ingots/${material}`
'tag': `forge:ingots/${material.getName()}`
},
result: {
'item': `gtceu:${material}_rod`,
'item': `gtceu:${material.getName()}_rod`,
'count': 2
}
}).id(`tfg:rolling/${material}_rod`)
}).id(`tfg:rolling/${material.getName()}_rod`)
}
}
@ -1407,13 +1407,13 @@ const registerGTCEURecipes = (event) => {
if (!ingotStack.isEmpty()) {
event.recipes.createCrushing(dustStack, ingotStack)
.processingTime(250)
.id(`tfg:crushing/${material}_dust`)
.id(`tfg:crushing/${material.getName()}_dust`)
}
if (!gemStack.isEmpty()) {
event.recipes.createMilling(dustStack, gemStack)
.processingTime(200)
.id(`tfg:milling/${material}_dust`)
.id(`tfg:milling/${material.getName()}_dust`)
}
}

390
kubejs/server_scripts/tfc/recipes.js
View file

File diff suppressed because it is too large Load diff

23
kubejs/startup_scripts/gtceu/constants.js
View file

@ -42,27 +42,4 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:rubber_log',
'gtceu:rubber_leaves',
'gtceu:rubber_planks',
];
global.GTCEU_ANVIL_TOOL_TYPES = [
GTToolType.SWORD,
GTToolType.PICKAXE,
GTToolType.SHOVEL,
GTToolType.AXE,
GTToolType.HOE,
GTToolType.MINING_HAMMER,
GTToolType.SPADE,
GTToolType.SAW,
GTToolType.HARD_HAMMER,
// GTToolType.SOFT_MALLET,
// GTToolType.WRENCH,
GTToolType.FILE,
// GTToolType.CROWBAR,
// GTToolType.SCREWDRIVER,
// GTToolType.MORTAR,
// GTToolType.WIRE_CUTTER,
GTToolType.SCYTHE,
GTToolType.KNIFE,
GTToolType.BUTCHERY_KNIFE,
// GTToolType.PLUNGER
];

2
mods

@ -1 +1 @@
Subproject commit c0c557983fa48d548a01101cb2fbc849866b4163
Subproject commit 0335f6a01fdc0ed8aec312c6d97c58906d24c95c