Feature: Tier 2 insulation (#1349)
* Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * models Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * textures Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * ad as Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update tags.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.removes.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.removes.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.miscellaneous.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update items.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update materials.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.miscellaneous.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Signed-off-by: Pyritie <pyritie@gmail.com> Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
parent
2855552f11
commit
0a32609a4b
21 changed files with 215 additions and 16 deletions
12
CHANGELOG.md
12
CHANGELOG.md
|
|
@ -7,7 +7,8 @@
|
|||
- Gave plants tag to bushes so they can be used for other things (#1338) @Redeix
|
||||
- Allowed elytra's to be repaired regardless of damage (#1338) @Redeix
|
||||
- Increased maximum range of rope/elevator pulleys to 400 blocks (#1347) @Pyritie
|
||||
- Added tfc data to tacz guns and attachments (#1353) Redeix
|
||||
- Added Tier 2 Insulation: Alkaline Earth Silicate @BlueBoat29
|
||||
- Added tfc data to tacz guns and attachments (#1353) @Redeix
|
||||
### Bug fixes
|
||||
- Fixed yeast food processor conflict (#1310) @Redeix
|
||||
- Fixed seed oil voiding in barrels (#1310) @Redeix
|
||||
|
|
@ -32,10 +33,11 @@
|
|||
- Fixed Quests #1318 #1291 and finish other quests related stuffs @TomPlop
|
||||
- Integrated Ad Astra wood types with tfc (#1346) @Redeix
|
||||
- Fixed duplicate pizza dough recipe @Pyritie
|
||||
- Fixed treated composite barrel recipe lang (#1353) Redeix
|
||||
- Fixed food processor jam recipe duping jars (#1353) Redeix
|
||||
- Fixed Ad Astra space suit quest mentioning oxygen instead of breathable gas (#1353) Redeix
|
||||
- Fixed flintlock not being craftable before LV (#1353) Redeix
|
||||
- Unified Pressure Plate Recipes among mods @BlueBoat29
|
||||
- Fixed treated composite barrel recipe lang (#1353) @Redeix
|
||||
- Fixed food processor jam recipe duping jars (#1353) @Redeix
|
||||
- Fixed Ad Astra space suit quest mentioning oxygen instead of breathable gas (#1353) @Redeix
|
||||
- Fixed flintlock not being craftable before LV (#1353) @Redeix
|
||||
|
||||
## [0.10.0] - 13.07.2025
|
||||
- [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!
|
||||
|
|
|
|||
6
kubejs/assets/tfg/models/item/aes_compressed_wool.json
Normal file
6
kubejs/assets/tfg/models/item/aes_compressed_wool.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/aes_compressed_wool"
|
||||
}
|
||||
}
|
||||
6
kubejs/assets/tfg/models/item/aes_insulation_roll.json
Normal file
6
kubejs/assets/tfg/models/item/aes_insulation_roll.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/aes_insulation_roll"
|
||||
}
|
||||
}
|
||||
6
kubejs/assets/tfg/models/item/aes_insulation_sheet.json
Normal file
6
kubejs/assets/tfg/models/item/aes_insulation_sheet.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/aes_insulation_sheet"
|
||||
}
|
||||
}
|
||||
6
kubejs/assets/tfg/models/item/aes_wool.json
Normal file
6
kubejs/assets/tfg/models/item/aes_wool.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/aes_wool"
|
||||
}
|
||||
}
|
||||
BIN
kubejs/assets/tfg/textures/item/aes_compressed_wool.png
Normal file
BIN
kubejs/assets/tfg/textures/item/aes_compressed_wool.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 834 B |
BIN
kubejs/assets/tfg/textures/item/aes_insulation_roll.png
Normal file
BIN
kubejs/assets/tfg/textures/item/aes_insulation_roll.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
kubejs/assets/tfg/textures/item/aes_insulation_sheet.png
Normal file
BIN
kubejs/assets/tfg/textures/item/aes_insulation_sheet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 864 B |
BIN
kubejs/assets/tfg/textures/item/aes_wool.png
Normal file
BIN
kubejs/assets/tfg/textures/item/aes_wool.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
|
|
@ -573,13 +573,14 @@ const registerAdAstraRecipes = (event) => {
|
|||
], {
|
||||
B: '#tfc:hammers',
|
||||
C: `ad_astra:${x.type}_plating_slab`,
|
||||
D: '#forge:springs',
|
||||
D: '#forge:small_springs',
|
||||
E: '#forge:tools/screwdrivers'
|
||||
}).id(`tfg:shaped/ad_astra_${x.type}_pressure_plate`)
|
||||
|
||||
event.recipes.gtceu.assembler(`tfg:ad_astra_${x.type}_pressure_plate`)
|
||||
.itemInputs('#forge:springs', `ad_astra:${x.type}_plating_slab`)
|
||||
.itemInputs('#forge:small_springs', `2x ad_astra:${x.type}_plating_slab`)
|
||||
.itemOutputs(`ad_astra:${x.type}_plating_pressure_plate`)
|
||||
.circuit(0)
|
||||
.duration(50)
|
||||
.EUt(2)
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,10 @@ const registerAdAstraItemTags = (event) => {
|
|||
// Insulation Tier 1
|
||||
event.add('forge:insulation_t1', 'gtceu:borosilicate_glass_dust')
|
||||
event.add('forge:insulation_t1', 'gtceu:vitrified_asbestos_dust')
|
||||
|
||||
//Insulation Tier 2
|
||||
event.add('forge:insulation_t2', 'tfg:aes_insulation_sheet')
|
||||
event.add('forge:insulation_t2', 'tfg:aes_insulation_roll')
|
||||
|
||||
// Deco blocks
|
||||
const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ];
|
||||
|
|
|
|||
|
|
@ -40,21 +40,22 @@ const registerAFCRecipes = (event) => {
|
|||
// Плита -> Пиломатериалы
|
||||
generateCutterRecipe(event, `afc:wood/planks/${wood}_slab`, `2x afc:wood/lumber/${wood}`, 50, 7, `${wood}_lumber_from_slab`)
|
||||
|
||||
|
||||
|
||||
// ? -> Деревянная нажимная пластина
|
||||
event.shaped(`afc:wood/planks/${wood}_pressure_plate`, [
|
||||
'ABA',
|
||||
' B ',
|
||||
'CDC',
|
||||
'AEA'
|
||||
' E '
|
||||
], {
|
||||
A: '#forge:screws/wood',
|
||||
B: '#tfc:hammers',
|
||||
C: `afc:wood/planks/${wood}_slab`,
|
||||
D: '#forge:springs',
|
||||
D: '#forge:small_springs',
|
||||
E: '#forge:tools/screwdrivers'
|
||||
}).id(`afc:crafting/wood/${wood}_pressure_plate`)
|
||||
|
||||
event.recipes.gtceu.assembler(`${wood}_pressure_plate`)
|
||||
.itemInputs('#forge:springs', `2x afc:wood/planks/${wood}_slab`)
|
||||
.itemInputs('#forge:small_springs', `2x afc:wood/planks/${wood}_slab`)
|
||||
.circuit(0)
|
||||
.itemOutputs(`2x afc:wood/planks/${wood}_pressure_plate`)
|
||||
.duration(50)
|
||||
|
|
@ -64,7 +65,7 @@ const registerAFCRecipes = (event) => {
|
|||
event.remove({ id: `afc:crafting/wood/${wood}_button` })
|
||||
|
||||
generateCutterRecipe(event, `afc:wood/planks/${wood}_pressure_plate`, `6x afc:wood/planks/${wood}_button`, 50, 2, `${wood}_button`)
|
||||
|
||||
|
||||
//Stomping Barrel
|
||||
event.remove({ id: `afc:crafting/wood/${wood}_stomping_barrel`})
|
||||
|
||||
|
|
@ -284,4 +285,4 @@ const registerAFCRecipes = (event) => {
|
|||
processingTime: 50
|
||||
}).id(`tfg:vi/lathe/stripping_${wood}_wood`)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@ function removeGreateRecipes(event) {
|
|||
})
|
||||
|
||||
event.remove({ mod: 'greate', input: 'create:andesite_alloy' });
|
||||
event.remove({ mod: 'greate', output: 'minecraft:bamboo_pressure_plate'})
|
||||
|
||||
event.remove({ id: 'greate:shapeless/large_andesite_alloy_cogwheel_from_little' })
|
||||
event.remove({ id: 'greate:shapeless/large_steel_cogwheel_from_little' })
|
||||
|
|
|
|||
|
|
@ -1282,4 +1282,22 @@ const registerGTCEURecipes = (event) => {
|
|||
//#endregion
|
||||
|
||||
event.replaceInput({ id: 'gtceu:shaped/powderbarrel' }, 'gtceu:wood_plate', '#tfc:lumber')
|
||||
|
||||
event.shaped('gtceu:treated_wood_pressure_plate', [
|
||||
' B ',
|
||||
'CDC',
|
||||
' E '
|
||||
], {
|
||||
B: '#tfc:hammers',
|
||||
C: 'gtceu:treated_wood_slab',
|
||||
D: '#forge:small_springs',
|
||||
E: '#forge:tools/screwdrivers'
|
||||
}).id('gtceu:shaped/treated_pressure_plate')
|
||||
|
||||
event.recipes.gtceu.assembler('gtceu:treated_pressure_plate')
|
||||
.itemInputs('#forge:small_springs', '2x gtceu:treated_wood_slab')
|
||||
.itemOutputs('gtceu:treated_wood_pressure_plate')
|
||||
.circuit(0)
|
||||
.duration(50)
|
||||
.EUt(2)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -683,6 +683,19 @@ function removeGTCEURecipes(event) {
|
|||
|
||||
event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' })
|
||||
event.remove({ id: 'gtceu:compressor/compress_plate_dust_treated_wood'})
|
||||
|
||||
// Remove Default Pressure Plate Recipes
|
||||
const MC_PRESSURE_PLATES = [
|
||||
'bamboo',
|
||||
'polished_blackstone',
|
||||
'light_weighted',
|
||||
'heavy_weighted',
|
||||
'treated'
|
||||
]
|
||||
MC_PRESSURE_PLATES.forEach(material => {
|
||||
event.remove({ id: `gtceu:shaped/${material}_pressure_plate` })
|
||||
event.remove({ id: `gtceu:assembler/${material}_pressure_plate` })
|
||||
})
|
||||
}
|
||||
|
||||
function removeMaceratorRecipe(event, id) {
|
||||
|
|
@ -693,4 +706,4 @@ function removeMaceratorRecipe(event, id) {
|
|||
function removeCutterRecipe(event, id) {
|
||||
event.remove({ id: `gtceu:cutter/${id}` })
|
||||
event.remove({ id: `greate:cutting/integration/gtceu/cutter/${id}` })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1085,4 +1085,31 @@ const registerMinecraftRecipes = (event) => {
|
|||
.id('tfg:shapeless/gunpowder_tfc_style')
|
||||
|
||||
event.shapeless('8x minecraft:bone_meal', ['#forge:tools/mortars', 'minecraft:skeleton_skull'])
|
||||
|
||||
//Pressure Plates
|
||||
const PRESSURE_PLATES = [
|
||||
{type: 'bamboo', material: 'minecraft:bamboo_slab'},
|
||||
{type: 'polished_blackstone', material: 'minecraft:polished_blackstone_slab'},
|
||||
{type: 'light_weighted', material: '#forge:plates/gold'},
|
||||
{type: 'heavy_weighted', material: '#forge:plates/iron'}
|
||||
]
|
||||
PRESSURE_PLATES.forEach(x => {
|
||||
event.shaped(`minecraft:${x.type}_pressure_plate`, [
|
||||
' B ',
|
||||
'CDC',
|
||||
' E '
|
||||
], {
|
||||
B: '#tfc:hammers',
|
||||
C: x.material,
|
||||
D: '#forge:small_springs',
|
||||
E: '#forge:tools/screwdrivers'
|
||||
}).id(`minecraft:shaped/${x.type}_pressure_plate`)
|
||||
|
||||
event.recipes.gtceu.assembler(`minecraft:${x.type}_pressure_plate`)
|
||||
.itemInputs('#forge:small_springs', `2x ${x.material}`)
|
||||
.itemOutputs(`minecraft:${x.type}_pressure_plate`)
|
||||
.circuit(0)
|
||||
.duration(50)
|
||||
.EUt(2)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -805,4 +805,84 @@ function registerTFGMiscellaneousRecipes(event) {
|
|||
.duration(200)
|
||||
.circuit(4)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
|
||||
//Rock-wool stuff
|
||||
event.recipes.gtceu.mixer('aes_mix')
|
||||
.itemInputs('5x gtceu:silicon_dioxide_dust', '4x gtceu:quicklime_dust', 'gtceu:magnesia_dust')
|
||||
.itemOutputs('10x tfg:aes_mix_dust')
|
||||
.duration(160)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.electric_blast_furnace('molten_aes')
|
||||
.itemInputs('2x tfg:aes_mix_dust')
|
||||
.outputFluids(Fluid.of('tfg:molten_aes', 1000))
|
||||
.chancedOutput('gtceu:ash_dust', 3000, 0)
|
||||
.circuit(1)
|
||||
.duration(400)
|
||||
.blastFurnaceTemp(3000)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.electric_blast_furnace('molten_aes_he')
|
||||
.itemInputs('2x tfg:aes_mix_dust')
|
||||
.inputFluids(Fluid.of('gtceu:helium', 200))
|
||||
.outputFluids(Fluid.of('tfg:molten_aes', 1000))
|
||||
.circuit(2)
|
||||
.duration(140)
|
||||
.blastFurnaceTemp(3000)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.centrifuge('aes_wool')
|
||||
.inputFluids(Fluid.of('tfg:molten_aes', 200))
|
||||
.itemOutputs('tfg:aes_wool')
|
||||
.duration(30)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.forming_press('aes_compressed_wool')
|
||||
.itemInputs('4x tfg:aes_wool')
|
||||
.notConsumable('gtceu:ingot_casting_mold')
|
||||
.itemOutputs('tfg:aes_compressed_wool')
|
||||
.duration(40)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.chemical_bath('aes_insulation_sheet')
|
||||
.itemInputs('tfg:aes_compressed_wool')
|
||||
.inputFluids(Fluid.of('gtceu:epoxy', 72))
|
||||
.circuit(1)
|
||||
.itemOutputs('tfg:aes_insulation_sheet')
|
||||
.duration(80)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.chemical_bath('aes_insulation_roll')
|
||||
.itemInputs('9x tfg:aes_compressed_wool')
|
||||
.inputFluids(Fluid.of('gtceu:epoxy', 648))
|
||||
.itemOutputs('tfg:aes_insulation_roll')
|
||||
.circuit(9)
|
||||
.duration(400)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.assembler('aes_insulation_roll')
|
||||
.itemInputs('9x tfg:aes_insulation_sheet')
|
||||
.itemOutputs('tfg:aes_insulation_roll')
|
||||
.circuit(0)
|
||||
.duration(20)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
|
||||
event.shaped('tfg:aes_insulation_roll', [
|
||||
'AAA',
|
||||
'AAA',
|
||||
'AAA'
|
||||
], {
|
||||
A: 'tfg:aes_insulation_sheet',
|
||||
}).id('tfg:shaped/aes_insulation_roll')
|
||||
|
||||
event.recipes.gtceu.assembler('aes_insulation_sheet')
|
||||
.itemInputs('9x tfg:aes_insulation_sheet')
|
||||
.itemOutputs('tfg:aes_insulation_roll')
|
||||
.circuit(0)
|
||||
.duration(20)
|
||||
.EUt(GTValues.VA[GTValues.LV])
|
||||
|
||||
event.shapeless('9x tfg:aes_insulation_sheet', [
|
||||
'tfg:aes_insulation_roll'
|
||||
]).id('tfg:shapeless/aes_insulation_sheet')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -332,4 +332,15 @@ const registerTFGItems = (event) => {
|
|||
event.create('tfg:nitrocellulose')
|
||||
.translationKey('tfg:nitrocellulose')
|
||||
//endregion
|
||||
}
|
||||
|
||||
//RockWool
|
||||
event.create('tfg:aes_wool')
|
||||
.translationKey('tfg:aes_wool')
|
||||
event.create('tfg:aes_compressed_wool')
|
||||
.translationKey('tfg:aes_compressed_wool')
|
||||
event.create('tfg:aes_insulation_sheet')
|
||||
.translationKey('tfg:aes_insulation_sheet')
|
||||
event.create('tfg:aes_insulation_roll')
|
||||
.translationKey('tfg:aes_insulation_roll')
|
||||
//endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,4 +136,21 @@ const registerTFGMaterials = (event) => {
|
|||
.gas()
|
||||
.components('8x helium_3', '11x oxygen', '11x hydrogen')
|
||||
.color(0xEDFFB3)
|
||||
//end region
|
||||
|
||||
//Region Rockwool
|
||||
event.create('tfg:aes_mix')
|
||||
.dust()
|
||||
.flags(GTMaterialFlags.DECOMPOSITION_BY_CENTRIFUGING)
|
||||
.components('5x silicon_dioxide', '4x quicklime', '1x magnesia')
|
||||
.hazard(HazardProperty.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.CHEMICAL_BURNS)
|
||||
.color(0xE0E9E4)
|
||||
//.secondaryColor(0x54483d)
|
||||
event.create('tfg:molten_aes')
|
||||
.liquid(2900)
|
||||
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
|
||||
.components('5x silicon_dioxide', '4x quicklime', '1x magnesia')
|
||||
.color(0xe65609)
|
||||
.secondaryColor(0xe65609)
|
||||
//end region
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
BIN
tacz/ulv_guns.zip
Normal file
BIN
tacz/ulv_guns.zip
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue