Merge branch 'TerraFirmaGreg-Team:dev' into dev

This commit is contained in:
Redeix 2025-04-28 19:42:17 -05:00 committed by GitHub
commit 3299ca8ef8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 230 additions and 135 deletions

View file

@ -3,9 +3,18 @@
default_quest_shape: ""
filename: "ore_processing"
group: "19428C6E7A36D463"
icon: "gtceu:crushed_iron_ore"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:crushed_iron_ore"
}
id: "24C1683140DBB5F2"
order_index: 4
order_index: 3
quest_links: [ ]
quests: [
{

View file

@ -971,7 +971,16 @@
]
dependency_requirement: "one_completed"
description: ["{quests.steam_age.red_alloy.desc}"]
icon: "gtceu:red_alloy_ingot"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:red_alloy_ingot"
}
id: "781C6AD30194CB45"
shape: "square"
size: 1.0d

View file

@ -306,6 +306,12 @@
]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_saw"
tag: {
DisallowContainerItem: 0b
@ -1316,6 +1322,12 @@
]
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_pickaxe"
tag: {
DisallowContainerItem: 0b
@ -2079,7 +2091,16 @@
{
dependencies: ["5E186CD5E83BFDF0"]
description: ["{quests.stone_age.crush_ore.desc}"]
icon: "gtceu:crushed_copper_ore"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:crushed_copper_ore"
}
id: "2621BF784BEB7033"
subtitle: "{quests.stone_age.crush_ore.subtitle}"
tasks: [{
@ -2101,7 +2122,16 @@
{
dependencies: ["2621BF784BEB7033"]
description: ["{quests.stone_age.crush_crushed_ore.desc}"]
icon: "gtceu:impure_copper_dust"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:impure_copper_dust"
}
id: "050444CE0EA04FDF"
subtitle: "{quests.stone_age.crush_crushed_ore.subtitle}"
tasks: [
@ -2138,7 +2168,16 @@
{
dependencies: ["050444CE0EA04FDF"]
description: ["{quests.stone_age.clean_dust.desc}"]
icon: "gtceu:copper_dust"
icon: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:copper_dust"
}
id: "3462FD6E24F9BE0B"
subtitle: "{quests.stone_age.clean_dust.subtitle}"
tasks: [{

View file

@ -130,7 +130,7 @@
#.
#Game ticks required for a Fan-based processing recipe to take effect.
#Range: > 0
fanProcessingTime = 3200
fanProcessingTime = 400
#.
#Moving Contraptions
@ -249,13 +249,13 @@
[kinetics.stressValues.v2.impact]
display_board = 0.0
deployer = 0.25
mechanical_piston = 0.5
mechanical_piston = 0.25
millstone = 65535.0
mechanical_bearing = 1.0
mechanical_bearing = 0.5
clockwork_bearing = 0.5
cuckoo_clock = 0.125
speedometer = 0.0
copper_backtank = 0.5
copper_backtank = 0.25
mechanical_saw = 65535.0
flywheel = 0.0
encased_chain_drive = 0.0
@ -266,14 +266,14 @@
crushing_wheel = 65535.0
mechanical_mixer = 65535.0
gantry_shaft = 0.0
rope_pulley = 0.5
rope_pulley = 0.125
rotation_speed_controller = 0.0
mechanical_arm = 0.5
netherite_backtank = 0.5
mechanical_arm = 0.25
netherite_backtank = 0.25
andesite_encased_shaft = 65535.0
mechanical_press = 65535.0
large_cogwheel = 65535.0
mechanical_drill = 0.5
mechanical_drill = 0.25
andesite_encased_large_cogwheel = 65535.0
brass_encased_large_cogwheel = 65535.0
mysterious_cuckoo_clock = 0.125
@ -281,8 +281,8 @@
shaft = 65535.0
brass_encased_shaft = 65535.0
gearshift = 0.0
turntable = 0.5
sticky_mechanical_piston = 0.5
turntable = 0.25
sticky_mechanical_piston = 0.25
sequenced_gearshift = 0.0
weighted_ejector = 0.25
cogwheel = 65535.0
@ -290,8 +290,8 @@
belt = 65535.0
brass_encased_cogwheel = 65535.0
gearbox = 0.0
hose_pulley = 0.5
elevator_pulley = 0.5
hose_pulley = 0.25
elevator_pulley = 0.125
mechanical_crafter = 0.125
#.

View file

@ -1,84 +1,89 @@
{
"name": "Hazardous Materials",
"icon": "gtceu:raw_plutonium",
"category": "tfc:tfg_ores",
"priority": true,
"sortnum": 1,
"read_by_default": true,
"pages": [
{
"type": "patchouli:spotlight",
"title": "Hazardous Materials",
"item": "gtceu:raw_plutonium",
"text": "Some ores and dusts are hazardous and can cause negative effects or even kill you if they are carried in your inventory.$(br2)Certain equipment such as $(thing)masks$(), $(thing)gloves$(), and $(thing)hazardous material suits$() later on can be used to conter these effects"
},
{ "type": "patchouli:crafting", "title": "Face Mask", "recipe": "gtceu:shaped/face_mask" },
{
"type": "patchouli:spotlight",
"item": "gtceu:rubber_gloves",
"title": "Rubber gloves",
"link_recipes": true,
"text": "Rubber gloves can be made from $(l:mechanics/leather_making)leather$()."
},
{
"type": "tfc:knapping_recipe",
"recipe": "tfchotornot:leather_knapping/mittens",
"text": "First knap the leather into mittens."
},
{
"type": "tfc:sealed_barrel_recipe",
"recipe": "tfg:sealed_barrel/prepared_leather_gloves",
"text": "Mittens are then soaked in $(thing)Vinegar$(), a mixture of fruit and alcohol."
},
{
"type": "patchouli:spotlight",
"item": "tfg:latex_soaked_gloves",
"text": "Prepared leather gloves are then heated in a $(thing)vat$() with $(thing)Vulcanized Latex$(), a mixture of latex and wood ash."
},
{
"type": "patchouli:spotlight",
"item": "gtceu:rubber_gloves",
"text": "Finally, the latex-soaked gloves are heated in an $(l:firmalife/oven)Oven$()."
},
{
"type": "patchouli:spotlight",
"title": "Rocks",
"item": { "tag": "tfc:rock_knapping" },
"text": "The easiest way to prevent hazardous items from entering your inventory is to not pick them up at all.$(br)Filling your inventory with $(thing)Rocks$(), for example, will let you pick and choose which items you want to pick up, letting you deal with the hazardous ones all at once later."
},
{
"type": "patchouli:spotlight",
"title": "Containers",
"text": "Hazardous materials only deal damage while they are in your $(thing)inventory$(), but that doesn't apply to other containers!$(br)Hazardous materials will not deal damage while they are in another container such as a $(l:tfg_tips/inventory_management)Backpack$() or $(l:getting_started/pottery#vessel)Vessel$(). $(thing)Right-clicking$() while holding a vessel will allow direct transfer of it's contents to and from containers",
"item": "sophisticatedbackpacks:backpack,tfc:ceramic/vessel,tfc:ceramic/large_vessel"
},
{
"type": "patchouli:spotlight",
"title": "Spring Water",
"item": "tfc:bucket/spring_water",
"text": "Standing in $(thing)Spring Water$() will provide a slow $(thing)Regeneration$() effect."
},
{
"type": "patchouli:spotlight",
"title": "Aged Alcohol",
"text": "$(thing)Aged Alcohol$() will give potion buffs, some of which you might find useful.$(br2)You can drink them with a $(l:getting_started/pottery#jug)Jug$() or $(l:waterflasks/recipes)Flask$().",
"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey"
},
{
"type": "patchouli:text",
"text": "Aged Beer: Absorption II (20:00)$(br2)Aged Cider: Speed (5:20)$(br2)Aged Rum: Speed II (2:40)$(br2)Aged Sake: Resistance (5:20)$(br2)Aged Vodka: Resistance II (2:40)$(br2)Aged Corn Whiskey: Haste (5:20)$(br2)Aged Rye Whiskey: Haste (5:20)$(br2)Aged Whiskey: Haste II (2:40)"
},
{
"type": "patchouli:spotlight",
"item": { "tag": "tfc:foods" },
"title": "Nutrition",
"text": "Eating better foods with more $(l:getting_started/food_and_water#nutrients)nutrition$() will raise your maximum HP by a significant amount.$(br2)$(l:mechanics/pot#soup)Soups$(), $(l:mechanics/sandwiches)Sandwiches$(), and $(l:mechanics/salad)Salads$() are great for this."
},
{
"type": "patchouli:spotlight",
"title": "Bed",
"item": { "tag": "minecraft:beds" },
"text": "If all else fails, bringing along a bed to respawn is a good idea.$(br2)If you don't have access to $(thing)Wool$() or $(thing)String$(), you can also make a $(l:getting_started/a_place_to_sleep)Thatch Bed$()."
}
]
"name": "Hazardous Materials",
"icon": "gtceu:raw_plutonium",
"category": "tfc:tfg_ores",
"priority": true,
"sortnum": 1,
"read_by_default": true,
"pages": [
{
"type": "patchouli:spotlight",
"title": "Hazardous Materials",
"item": "gtceu:raw_plutonium",
"text": "Some ores and dusts are hazardous and can cause negative effects or even kill you if they are carried in your inventory.$(br2)Certain equipment such as $(thing)masks$(), $(thing)gloves$(), and $(thing)hazardous material suits$() later on can be used to counter these effects."
},
{
"type": "patchouli:crafting",
"title": "Face Mask",
"recipe": "gtceu:shaped/face_mask",
"text": "The $(thing)Face Mask$() provides protection from any $(item)Inhalation$() hazards, such as Arsenicosis."
},
{
"type": "patchouli:spotlight",
"item": "gtceu:rubber_gloves",
"title": "Rubber gloves",
"link_recipes": true,
"text": "Rubber gloves can either be made from $(l:mechanics/leather_making)Leather$() and $(l:arborfirmacraft/making_rubber)Latex$(), or out of Rubber Sheets. They provide protection from any $(item)Skin Contact$() hazards, such as Berylliosis."
},
{
"type": "tfc:knapping_recipe",
"recipe": "tfchotornot:leather_knapping/mittens",
"text": "First, knap the leather into mittens."
},
{
"type": "tfc:sealed_barrel_recipe",
"recipe": "tfg:sealed_barrel/prepared_leather_gloves",
"text": "Mittens are then soaked in $(thing)Vinegar$(), a mixture of fruit and alcohol."
},
{
"type": "patchouli:spotlight",
"item": "tfg:latex_soaked_gloves",
"text": "Prepared leather gloves are then heated in a $(thing)vat$() with $(thing)Vulcanized Latex$(), a mixture of latex and wood ash."
},
{
"type": "patchouli:spotlight",
"item": "gtceu:rubber_gloves",
"text": "Finally, the latex-soaked gloves are heated in an $(l:firmalife/oven)Oven$()."
},
{
"type": "patchouli:spotlight",
"title": "Rocks",
"item": { "tag": "tfc:rock_knapping" },
"text": "The easiest way to prevent hazardous items from entering your inventory is to not pick them up at all.$(br)Filling your inventory with $(thing)Rocks$(), for example, will let you pick and choose which items you want to pick up, letting you deal with the hazardous ones all at once later."
},
{
"type": "patchouli:spotlight",
"title": "Containers",
"text": "Hazardous materials only deal damage while they are in your $(thing)inventory$(), but that doesn't apply to other containers!$(br)Hazardous materials will not deal damage while they are in another container such as a $(l:tfg_tips/inventory_management)Backpack$() or $(l:getting_started/pottery#vessel)Vessel$(). $(thing)Right-clicking$() while holding a vessel will allow direct transfer of it's contents to and from containers",
"item": "sophisticatedbackpacks:backpack,tfc:ceramic/vessel,tfc:ceramic/large_vessel"
},
{
"type": "patchouli:spotlight",
"title": "Spring Water",
"item": "tfc:bucket/spring_water",
"text": "Standing in $(thing)Spring Water$() will provide a slow $(thing)Regeneration$() effect."
},
{
"type": "patchouli:spotlight",
"title": "Aged Alcohol",
"text": "$(thing)Aged Alcohol$() will give potion buffs, some of which you might find useful.$(br2)You can drink them with a $(l:getting_started/pottery#jug)Jug$() or $(l:waterflasks/recipes)Flask$().",
"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey"
},
{
"type": "patchouli:text",
"text": "Aged Beer: Absorption II (20:00)$(br2)Aged Cider: Speed (5:20)$(br2)Aged Rum: Speed II (2:40)$(br2)Aged Sake: Resistance (5:20)$(br2)Aged Vodka: Resistance II (2:40)$(br2)Aged Corn Whiskey: Haste (5:20)$(br2)Aged Rye Whiskey: Haste (5:20)$(br2)Aged Whiskey: Haste II (2:40)"
},
{
"type": "patchouli:spotlight",
"item": { "tag": "tfc:foods" },
"title": "Nutrition",
"text": "Eating better foods with more $(l:getting_started/food_and_water#nutrients)nutrition$() will raise your maximum HP by a significant amount.$(br2)$(l:mechanics/pot#soup)Soups$(), $(l:mechanics/sandwiches)Sandwiches$(), and $(l:mechanics/salad)Salads$() are great for this."
},
{
"type": "patchouli:spotlight",
"title": "Bed",
"item": { "tag": "minecraft:beds" },
"text": "If all else fails, bringing along a bed to respawn is a good idea.$(br2)If you don't have access to $(thing)Wool$() or $(thing)String$(), you can also make a $(l:getting_started/a_place_to_sleep)Thatch Bed$()."
}
]
}

View file

@ -1,9 +1,6 @@
PlayerEvents.tick((event) => {
const { player } = event;
if (player.age % 100 != 0) return;
if (player.legsArmorItem == 'gtceu:nanomuscle_leggings') {
if (player.age % 100 == 0 && player.legsArmorItem == 'gtceu:nanomuscle_leggings') {
player.potionEffects.add("minecraft:speed", 350, 1, true, false);
} else {
player.removeEffect("minecraft:speed");
}
});

View file

@ -348,7 +348,7 @@ const registerMinecraftRecipes = (event) => {
C: '#tfc:rock/smooth'
}).id('tfg:shaped/comparator_nether_quartz');
event.replaceInput({id: 'gtceu:shaped/redstone_lamp' }, 'minecraft:glass_pane', '#forge:glass_panes')
event.replaceInput({ id: 'gtceu:shaped/redstone_lamp' }, 'minecraft:glass_pane', '#forge:glass_panes')
event.recipes.gtceu.assembler('redstone_lamp')
.itemInputs('1x #forge:glass', '1x minecraft:glowstone', '1x #forge:rods/red_alloy')
.itemOutputs('minecraft:redstone_lamp')
@ -950,38 +950,38 @@ const registerMinecraftRecipes = (event) => {
//#region Campfire
event.shaped('minecraft:campfire', [
' A ',
'ABA',
'CDC'
], {
A: 'minecraft:blaze_rod',
B: 'minecraft:blaze_powder',
C: '#forge:ingots/blue_steel',
D: '#forge:storage_blocks/charcoal',
}).id('tfg:campfire_charcoal')
' A ',
'ABA',
'CDC'
], {
A: 'minecraft:blaze_rod',
B: 'minecraft:blaze_powder',
C: '#forge:ingots/blue_steel',
D: '#forge:storage_blocks/charcoal',
}).id('tfg:campfire_charcoal')
event.shaped('minecraft:campfire', [
' A ',
'ABA',
'CDC'
], {
A: 'minecraft:blaze_rod',
B: 'minecraft:blaze_powder',
C: '#forge:ingots/blue_steel',
D: '#forge:storage_blocks/coal',
}).id('tfg:campfire_coal')
' A ',
'ABA',
'CDC'
], {
A: 'minecraft:blaze_rod',
B: 'minecraft:blaze_powder',
C: '#forge:ingots/blue_steel',
D: '#forge:storage_blocks/coal',
}).id('tfg:campfire_coal')
//#endregion
//#region Smithing Table
event.shaped('minecraft:smithing_table', [
'C ',
'BB ',
'AA '
], {
A: '#minecraft:planks',
B: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Lead, 1),
C: '#forge:tools/hammers'
}).id('minecraft:shapeless/smithing_table')
//#region Smithing Table
event.shaped('minecraft:smithing_table', [
'C ',
'BB ',
'AA '
], {
A: '#minecraft:planks',
B: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Lead, 1),
C: '#forge:tools/hammers'
}).id('minecraft:shapeless/smithing_table')
event.recipes.gtceu.assembler('minecraft:assembler/smithing_table')
.itemInputs('2x #minecraft:planks', ChemicalHelper.get(TagPrefix.plate, GTMaterials.Lead, 2))
@ -990,6 +990,7 @@ const registerMinecraftRecipes = (event) => {
.duration(60)
.EUt(GTValues.VA[GTValues.ULV])
//#endregion
event.smelting('tfc:glue', 'minecraft:slime_ball').id('tfg:smelting/slime_to_glue')
event.smelting('tfc:glue', 'minecraft:slime_ball')
.id('tfg:smelting/slime_to_glue')
}

View file

@ -469,4 +469,35 @@ function registerTFCMachineRecipes(event) {
// Jute Fiber
generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', null, [], 100, 4, 16, 'tfg:tfc/jute_fiber')
// Ceramic Recycling
event.recipes.gtceu.macerator('tfg:sherd_to_brick_dust')
.itemInputs('firmalife:pottery_sherd')
.itemOutputs('5x #forge:dusts/brick')
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:ceramic_molds')
.itemInputs('#tfc:fired_molds')
.itemOutputs('2x #forge:dusts/brick')
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:large_vessels')
.itemInputs('#tfc:fired_large_vessels')
.itemOutputs('5x #forge:dusts/brick')
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:casting_channel')
.itemInputs('tfcchannelcasting:channel')
.itemOutputs('1x #forge:dusts/brick')
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:mold_table')
.itemInputs('tfcchannelcasting:mold_table')
.itemOutputs('5x #forge:dusts/brick')
.duration(20)
.EUt(2)
}

View file

@ -34,6 +34,10 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:flint_knife',
'gtceu:firebrick',
'gtceu:firebricks',
'gtceu:fireclay_dust',
'gtceu:small_fireclay_dust',
'gtceu:tiny_fireclay_dust',
'gtceu:compressed_fireclay',
'gtceu:wood_drum',
'gtceu:primitive_blast_furnace',
'gtceu:iron_pickaxe',