This commit is contained in:
Dmitry 2024-01-30 12:20:33 +07:00
parent 8ed47deb49
commit a4083b5644
10 changed files with 251 additions and 282 deletions

View file

@ -1,6 +1,13 @@
# Changelog
## [0.7.0]
## [0.7.0] - ?
### Changes
# Wip for now (required for update)
- Vanilla glass bottles has been replaced with TFC bottles.
- Recipes for plates, sticks, and others through Create mechanisms have been redistributed once again (an attempt to fix a crash).
- The primitive pump from GTCEu has been removed, so at the beginning of the game, you will have to pump water using a pump from Create.
## [0.6.9] - ?
### Changes
- The option to disable coordinates and some information has been re-enabled because firmaCiv has finally introduced items for tracking latitude and longitude, which is intended for determining one's own location. You can still view your coordinates through the mini-map, but this functionality will be disabled in the future when Antique Atlas and Game Stages are added.
- BetterF3 has been slightly configured.
@ -29,12 +36,9 @@
- Removed recipes for vanilla candles (use tfc candles pls)
- Added assembler recipes for TFC brick items.
- Hide EMI repairing recipes, because it's cursed..
- Candle colorization recipes in gtceu assembler
# Wip for now (required for update)
- MoreRed cable colorization via gtceu chemical bath
- Vanilla glass bottles has been replaced with TFC bottles.
- Recipes for plates, sticks, and others through Create mechanisms have been redistributed once again (an attempt to fix a crash).
- The primitive pump from GTCEu has been removed, so at the beginning of the game, you will have to pump water using a pump from Create.
- Candle colorization recipes in gtceu assembler.
- MoreRed cable colorization via gtceu chemical bath.
- Try to fix crash - create pressing.
## [0.6.8] - 24.01.2024
### Changes

View file

@ -1152,23 +1152,14 @@
subtitle: "200 seconds?! WHAT?!"
tasks: [
{
count: 8L
id: "767C47FF351DAE3B"
item: {
Count: 1b
id: "itemfilters:tag"
tag: {
value: "forge:ingots/plutonium"
}
}
title: "Plutonium Ingot"
id: "4DBCC15F0E1C0EB8"
item: "gtceu:plutonium_ingot"
type: "item"
}
{
amount: 1000L
fluid: "gtceu:radon"
id: "1C084B65DE6E73E8"
type: "fluid"
id: "59404B44C72FECD8"
item: "gtceu:radon_bucket"
type: "item"
}
]
title: "Radon"
@ -1229,10 +1220,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:epichlorohydrin"
id: "6F7D0A5B17A27928"
type: "fluid"
id: "4D0ABF930ECC4D7B"
item: "gtceu:epichlorohydrin_bucket"
type: "item"
}]
title: "Epichlorohydrin"
x: 2.25d
@ -1267,10 +1257,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:phenol"
id: "6255085946669894"
type: "fluid"
id: "7CB029DE17D67966"
item: "gtceu:phenol_bucket"
type: "item"
}]
title: "Phenol"
x: 2.25d
@ -1293,10 +1282,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:acetone"
id: "1E3E5800E5C37353"
type: "fluid"
id: "6F0BFB3747D3FDFB"
item: "gtceu:acetone_bucket"
type: "item"
}]
title: "Acetone"
x: 2.25d
@ -1396,10 +1384,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:gasoline"
id: "020DE8D27206C260"
type: "fluid"
id: "23F81DED8B4A515E"
item: "gtceu:gasoline_bucket"
type: "item"
}]
title: "Gasoline"
x: 1.125d
@ -1418,10 +1405,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:high_octane_gasoline"
id: "19A221C5CEFBFBFD"
type: "fluid"
id: "56691AAE2579FB70"
item: "gtceu:high_octane_gasoline_bucket"
type: "item"
}]
title: "High Octane Gasoline"
x: 0.0d
@ -1478,28 +1464,24 @@
size: 0.66d
tasks: [
{
amount: 1000000L
fluid: "gtceu:oxygen"
id: "1EE14254AE07512F"
type: "fluid"
id: "3860FB71F8A0E99F"
item: "gtceu:oxygen_bucket"
type: "item"
}
{
amount: 1000000L
fluid: "gtceu:nitrogen"
id: "5B8A8FE5DEFE0671"
type: "fluid"
id: "5A8C43467303CECE"
item: "gtceu:nitrogen_bucket"
type: "item"
}
{
amount: 64000L
fluid: "gtceu:helium"
id: "3ED5E362F1E5D701"
type: "fluid"
id: "58265BAC5C3F68C6"
item: "gtceu:helium_bucket"
type: "item"
}
{
amount: 32000L
fluid: "gtceu:argon"
id: "67F58B2FC8210270"
type: "fluid"
id: "6091B9958BDE790E"
item: "gtceu:argon_bucket"
type: "item"
}
]
title: "True Distillation: Air"
@ -1550,28 +1532,24 @@
size: 0.66d
tasks: [
{
amount: 40000L
fluid: "gtceu:benzene"
id: "6584A238101E369D"
type: "fluid"
id: "1CE89B320D8F213B"
item: "gtceu:benzene_bucket"
type: "item"
}
{
amount: 10000L
fluid: "gtceu:butadiene"
id: "1698E9791C31C10E"
type: "fluid"
id: "1704DE13A0C749B2"
item: "gtceu:butadiene_bucket"
type: "item"
}
{
amount: 64000L
fluid: "gtceu:ethylene"
id: "4274E80169CCBDE5"
type: "fluid"
id: "6731CE7073F05A40"
item: "gtceu:ethylene_bucket"
type: "item"
}
{
amount: 64000L
fluid: "gtceu:methane"
id: "3CB67401C15B84A7"
type: "fluid"
id: "12941D463CBE4704"
item: "gtceu:methane_bucket"
type: "item"
}
]
title: "True Distillation: Fuel"

View file

@ -485,10 +485,9 @@
id: "727075AAF9F91FAE"
size: 0.75d
tasks: [{
amount: 1000L
fluid: "gtceu:titanium_tetrachloride"
id: "7C9AC37E86D3398F"
type: "fluid"
id: "6B0E33342374C12E"
item: "gtceu:titanium_tetrachloride_bucket"
type: "item"
}]
title: "Almost Titanium²"
x: 5.625d
@ -811,10 +810,9 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 16000L
fluid: "gtceu:fluorine"
id: "27DBF159ADE55257"
type: "fluid"
id: "344000CF4AAC68AF"
item: "gtceu:fluorine_bucket"
type: "item"
}]
title: "Fluorine"
x: 5.625d
@ -1271,55 +1269,14 @@
shape: "rsquare"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:ammonia"
id: "5D4330FDC189D42D"
type: "fluid"
id: "1C3EBA2535471DB6"
item: "gtceu:ammonia_bucket"
type: "item"
}]
title: "Ammonia"
x: 6.75d
y: -0.75d
}
{
dependencies: ["6958029B5514D4EC"]
description: [
"With your new &bVacuum Freezer&r, you can now \"&ofreeze&r\" air into &aLiquid Air&r, granting access to &6Creative Flight&r! Do be sure to have a look at processing some additional &aLiquid Air&r - the products of its distillation are very appealing."
""
"&dXP Drain&r whilst flying has been &cdisabled&r in this pack."
]
icon: "better_angel_ring:angel_ring"
id: "4B4F53FB33DE1C62"
shape: "rsquare"
size: 0.66d
tasks: [{
id: "6E9FE61644EE53AB"
item: "better_angel_ring:angel_ring"
type: "item"
}]
title: "I believe I can fly"
x: 9.0d
y: -5.25d
}
{
dependencies: ["4024C831C77101CA"]
description: [
"If you're looking for a change of scene, the &5Void Dimension&r is a perfectly empty area for you to build your factory."
""
"It wouldn't be unwise to procure some manner of &aflight&r before venturing here - maybe look around and see if this pack has &6any options&r."
]
icon: "javd:portal_block"
id: "1011551290D3D7EA"
shape: "rsquare"
size: 0.66d
tasks: [{
id: "19CC2402A14AE77C"
item: "javd:portal_block"
type: "item"
}]
title: "Void Dimension Portal"
x: 9.0d
y: 0.375d
}
]
subtitle: ["Scale up your power and begin advanced chemistry"]
title: "&6HV&r - High Voltage"

View file

@ -1198,6 +1198,7 @@
tasks: [{
id: "28CFFA0F7A33E02F"
item: "gtceu:empty_spray_can"
match_nbt: false
type: "item"
}]
title: "Spray Can"
@ -1368,28 +1369,13 @@
]
icon: "gtceu:oxygen_bucket"
id: "1A77CA35F054F988"
rewards: [{
id: "147345CEB55ECB69"
item: {
Count: 1b
id: "gtceu:fluid_cell"
tag: {
Fluid: {
Amount: 1000
FluidName: "gtceu:oxygen"
}
}
}
type: "item"
}]
shape: "rsquare"
size: 0.66d
subtitle: "Achtually, it's Dioxygen..."
tasks: [{
amount: 1000L
fluid: "gtceu:oxygen"
id: "70F00C67C9698A78"
type: "fluid"
id: "4299C881ED57472D"
item: "gtceu:oxygen_bucket"
type: "item"
}]
title: "Breath of Fresh Oxygen"
x: -1.125d
@ -1406,27 +1392,12 @@
]
icon: "gtceu:glue_bucket"
id: "0EAC071414AEC07E"
rewards: [{
id: "0BDDB03645B6D2A1"
item: {
Count: 1b
id: "gtceu:fluid_cell"
tag: {
Fluid: {
Amount: 1000
FluidName: "gtceu:glue"
}
}
}
type: "item"
}]
size: 0.75d
subtitle: "Extractor? I hardly knew 'er!"
tasks: [{
amount: 1000L
fluid: "gtceu:glue"
id: "3DD156ECA99FFA11"
type: "fluid"
id: "204FF37CA2846468"
item: "gtceu:glue_bucket"
type: "item"
}]
title: "Glued"
x: 0.0d

View file

@ -138,10 +138,9 @@
size: 0.75d
subtitle: "One of many hydrocarbons"
tasks: [{
amount: 1000L
fluid: "gtceu:ethylene"
id: "3A731EA79DC53FF3"
type: "fluid"
id: "286ED57C12F41DF2"
item: "gtceu:ethylene_bucket"
type: "item"
}]
title: "Ethylene"
x: 1.125d
@ -165,10 +164,9 @@
size: 0.66d
subtitle: "Yo, wait - that's alcohol!"
tasks: [{
amount: 1000L
fluid: "gtceu:ethanol"
id: "32A6A0A1AD2420B5"
type: "fluid"
id: "65AD613CEB9435CB"
item: "gtceu:ethanol_bucket"
type: "item"
}]
title: "Ethanol"
x: 0.0d
@ -190,16 +188,14 @@
size: 0.66d
tasks: [
{
amount: 1000L
fluid: "gtceu:sulfuric_naphtha"
id: "52B84DA79A608865"
type: "fluid"
id: "64118ED7C2393AA4"
item: "gtceu:naphtha_bucket"
type: "item"
}
{
amount: 1000L
fluid: "gtceu:naphtha"
id: "688B65D39AB8C533"
type: "fluid"
id: "2CDC4272BD17EB7D"
item: "gtceu:sulfuric_naphtha_bucket"
type: "item"
}
]
title: "Naphtha"
@ -224,10 +220,9 @@
size: 0.66d
subtitle: "Fuel and oil cracking can get complicated..."
tasks: [{
amount: 1000L
fluid: "gtceu:severely_steam_cracked_naphtha"
id: "7CC9EB9D859AC860"
type: "fluid"
id: "11731C5DF7FBC8DF"
item: "gtceu:severely_steam_cracked_naphtha_bucket"
type: "item"
}]
title: "Fuel Cracking"
x: 0.0d
@ -1322,16 +1317,14 @@
subtitle: "Let's etch some Copper off Circuit Boards!"
tasks: [
{
amount: 1000L
fluid: "gtceu:sodium_persulfate"
id: "4DB5BD79EF3A89CD"
type: "fluid"
id: "78987D2587319508"
item: "gtceu:iron_iii_chloride_bucket"
type: "item"
}
{
amount: 1000L
fluid: "gtceu:iron_iii_chloride"
id: "1A3BFA0BCD0FE977"
type: "fluid"
id: "33509BA5416BC14F"
item: "gtceu:sodium_persulfate_bucket"
type: "item"
}
]
title: "Sodium Persulfate / Iron III Chloride"
@ -1360,10 +1353,9 @@
shape: "square"
size: 0.75d
tasks: [{
amount: 1000L
fluid: "gtceu:sulfuric_acid"
id: "3A6BB63D057CB4C1"
type: "fluid"
id: "6A7372203A20D7CA"
item: "gtceu:sulfuric_acid_bucket"
type: "item"
}]
title: "Sulfuric Acid"
x: 1.125d
@ -1391,10 +1383,9 @@
id: "64CACABB48635904"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:hydrochloric_acid"
id: "0E914778748C954B"
type: "fluid"
id: "447B1F9FF3A2D837"
item: "gtceu:hydrochloric_acid_bucket"
type: "item"
}]
title: "Hydrochloric Acid"
x: 3.375d
@ -1593,43 +1584,11 @@
id: "0774EC59CD3DD7A5"
size: 0.66d
subtitle: "Ever mined into an Oil deposit?"
tasks: [
{
id: "21FF6E45F9AC5E76"
item: {
Count: 1b
id: "itemfilters:or"
tag: {
items: [
{
Count: 1b
id: "gtceu:lv_pump"
}
{
Count: 1b
id: "gtceu:mv_pump"
}
{
Count: 1b
id: "gtceu:hv_pump"
}
{
Count: 1b
id: "gtceu:ev_pump"
}
]
}
}
title: "Any Pump will do"
type: "item"
}
{
amount: 32000L
fluid: "gtceu:oil"
id: "1DAA9C9BBD9118E3"
type: "fluid"
}
]
tasks: [{
id: "05B59556092AC5EB"
item: "gtceu:oil_bucket"
type: "item"
}]
title: "US Simulator"
x: -1.125d
y: -0.75d
@ -1649,7 +1608,7 @@
""
"Oilsands are a &6great starting point&r - they'll tide you over until you unlock Fluid Drilling Rigs."
]
icon: "gtceu:oilsands_ore"
icon: "gtceu:marble_oilsands_ore"
id: "575B07D390D9D079"
size: 0.66d
tasks: [
@ -1660,10 +1619,9 @@
type: "item"
}
{
amount: 16000L
fluid: "gtceu:oil"
id: "0FBA08831B6ACC88"
type: "fluid"
id: "18DBDA6D5021E9FA"
item: "gtceu:oil_bucket"
type: "item"
}
]
title: "America Simulator"
@ -1749,22 +1707,19 @@
subtitle: "Whoever smelt it..."
tasks: [
{
amount: 8000L
fluid: "gtceu:refinery_gas"
id: "38CB42385A6EC17A"
type: "fluid"
id: "55FA956EF00E68C9"
item: "gtceu:lpg_bucket"
type: "item"
}
{
amount: 32000L
fluid: "gtceu:methane"
id: "4AB130A15CFC7A56"
type: "fluid"
id: "0669F66C86C8D31B"
item: "gtceu:methane_bucket"
type: "item"
}
{
amount: 32000L
fluid: "gtceu:lpg"
id: "79FEB48F1A4555C4"
type: "fluid"
id: "4B82683A47C13A07"
item: "gtceu:refinery_gas_bucket"
type: "item"
}
]
title: "The Church of Natural Farts"
@ -1790,10 +1745,9 @@
id: "00E1A728E6F6D6A0"
size: 0.66d
tasks: [{
amount: 1000L
fluid: "gtceu:benzene"
id: "7A452201C64FBB89"
type: "fluid"
id: "63594021204B976A"
item: "gtceu:benzene_bucket"
type: "item"
}]
title: "The Church of Benzene"
x: -2.25d
@ -1815,16 +1769,14 @@
size: 0.66d
tasks: [
{
amount: 1000L
fluid: "gtceu:sulfuric_light_fuel"
id: "236B5EB787DBCE64"
type: "fluid"
id: "694F46D263E7A235"
item: "gtceu:light_fuel_bucket"
type: "item"
}
{
amount: 1000L
fluid: "gtceu:light_fuel"
id: "4ED6B22C7B662325"
type: "fluid"
id: "7FE38BAB7B545EF9"
item: "gtceu:sulfuric_light_fuel_bucket"
type: "item"
}
]
title: "Light Fuel"
@ -1855,10 +1807,9 @@
size: 0.66d
subtitle: "Mother, how is diesel made?"
tasks: [{
amount: 30000L
fluid: "gtceu:diesel"
id: "24373463B7296EE0"
type: "fluid"
id: "49A059992EE21C9A"
item: "gtceu:diesel_bucket"
type: "item"
}]
title: "The Church of Diesel"
x: -2.25d

View file

@ -1386,17 +1386,20 @@ const registerGTCEURecipes = (event) => {
if (material.hasProperty(PropertyKey.INGOT))
{
// Слиток -> Стержень
event.recipes.createPressing(plateStack.withChance(0.97), ingotStack)
if (!plateStack.isEmpty()) {
// Слиток -> Стержень
event.recipes.createPressing(plateStack.withChance(0.97), ingotStack)
.id(`tfg:pressing/${material.getName()}_plate`)
if (!blockStack.isEmpty()) {
if (!blockStack.isEmpty()) {
// 9х Слиток -> Блок
event.recipes.createCompacting(blockStack, ingotStack.withCount(9))
.heated()
.id(`tfg:compacting/${material.getName()}_block`)
}
}
}
else
{
@ -1412,19 +1415,19 @@ const registerGTCEURecipes = (event) => {
// Прокатка стержней
if (material.hasFlag($MaterialFlags.GENERATE_ROD) && material != GTMaterials.Wood)
{
if (material.hasProperty(PropertyKey.INGOT))
{
let rodStack = ChemicalHelper.get(TagPrefix.rod, material, 2)
if (!ingotStack.isEmpty() && !rodStack.isEmpty()) {
event.custom({
type: "createaddition:rolling",
input: {
'tag': `forge:ingots/${material.getName()}`
},
result: {
'item': `gtceu:${material.getName()}_rod`,
'count': 2
}
input: ingotStack.toJson(),
result: rodStack.toJson()
}).id(`tfg:rolling/${material.getName()}_rod`)
}
}

View file

@ -2565,7 +2565,7 @@ const registerMinecraftRecipes = (event) => {
event.shaped('minecraft:lead', [
' AA',
' BA',
'A '
'A '
], {
A: '#forge:string',
B: '#forge:rings/wrought_iron'

View file

@ -248,4 +248,26 @@ const registerMoreRedRecipes = (event) => {
.itemOutputs('morered:bitwise_xnor_gate')
.duration(100)
.EUt(16)
//#region Выход: Крашеные провода
event.recipes.gtceu.chemical_bath(`tfg:morered/wire_decolor`)
.itemInputs('#morered:colored_network_cables')
.inputFluids(Fluid.of(`gtceu:chlorine`, 72))
.itemOutputs('morered:red_alloy_wire')
.duration(300)
.EUt(4)
global.MINECRAFT_DYE_NAMES.forEach(dye => {
event.recipes.gtceu.chemical_bath(`tfg:morered/${dye}_wire`)
.itemInputs('morered:red_alloy_wire')
.inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72))
.itemOutputs(`morered:${dye}_network_cable`)
.duration(300)
.EUt(4)
})
//#endregion
}

View file

@ -1535,6 +1535,14 @@ const registerTFCRecipes = (event) => {
//#region Камень
global.TFC_STONE_TYPES.forEach(stone => {
// Кирпич (предмет)
event.recipes.gtceu.assembler(`tfg:tfc/${stone}_loose_to_brick`)
.itemInputs(`tfc:rock/loose/${stone}`)
.itemOutputs(`tfc:brick/${stone}`)
.duration(40)
.EUt(8)
//#region Сырой камень
// Сырой камень -> Сырой камень
@ -2856,6 +2864,70 @@ const registerTFCRecipes = (event) => {
.duration(800)
.EUt(8)
// Brass Mechanism
event.recipes.gtceu.assembler('tfg:tfc/brass_mechanism')
.itemInputs('#forge:plates/brass')
.circuit(10)
.itemOutputs('tfc:brass_mechanisms')
.duration(100)
.EUt(4)
// 1x Small SheepSkin -> 1x Wool
event.recipes.gtceu.assembler('tfg:tfc/wool_1')
.itemInputs('tfc:small_sheepskin_hide')
.itemOutputs('tfc:wool')
.duration(100)
.EUt(4)
// 1x Medium SheepSkin -> 1x Wool
event.recipes.gtceu.assembler('tfg:tfc/wool_2')
.itemInputs('tfc:medium_sheepskin_hide')
.itemOutputs('2x tfc:wool')
.duration(100)
.EUt(4)
// 1x Large SheepSkin -> 1x Wool
event.recipes.gtceu.assembler('tfg:tfc/wool_3')
.itemInputs('tfc:large_sheepskin_hide')
.itemOutputs('3x tfc:wool')
.duration(100)
.EUt(4)
// Wool Yarn
event.recipes.gtceu.wiremill('tfg:tfc/wool_yarn')
.itemInputs('tfc:wool')
.itemOutputs('8x tfc:wool_yarn')
.duration(100)
.EUt(4)
// Burlap Cloth
event.recipes.gtceu.assembler('tfg:tfc/burlap_cloth')
.itemInputs('12x tfc:jute_fiber')
.itemOutputs('tfc:burlap_cloth')
.duration(100)
.EUt(4)
// Silk Cloth
event.recipes.gtceu.assembler('tfg:tfc/silk_cloth')
.itemInputs('24x minecraft:string')
.itemOutputs('tfc:silk_cloth')
.duration(100)
.EUt(4)
// Silk Cloth
event.recipes.gtceu.assembler('tfg:tfc/wool_cloth')
.itemInputs('16x tfc:wool_yarn')
.itemOutputs('tfc:wool_cloth')
.duration(100)
.EUt(4)
// Jute Fiber
generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', [], 100, 4, 16, 'tfg:tfc/jute_fiber')
// Soda Ash
event.smelting('3x tfc:powder/soda_ash', 'tfc:food/dried_seaweed').id('tfg:smelting/dried_seaweed_to_soda')
event.smelting('3x tfc:powder/soda_ash', 'tfc:food/dried_kelp').id('tfg:smelting/dried_kelp_to_soda')
//#region Обрушения
event.recipes.tfc.collapse('#tfg:rock_slabs').id('tfg:collapse/rock_slabs')
@ -2896,4 +2968,14 @@ const registerTFCRecipes = (event) => {
//#endregion
}
}
/*
event.recipes.gtceu.assembler('')
.itemInputs('')
.itemOutputs('')
.duration(100)
.EUt(4)
*/

View file

@ -920,7 +920,8 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
{ input: '#forge:dusts/saltpeter', output: '4x tfc:powder/saltpeter', name: 'saltpeter_powder' },
{ input: '#forge:dusts/salt', output: '4x tfc:powder/salt', name: 'salt_powder' },
{ input: '#forge:dusts/graphite', output: '4x tfc:powder/graphite', name: 'graphite_powder' },
{ input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }
{ input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' },
{ input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' },
];
global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [