Merge branch 'main' into colored_glass_macerate
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
This commit is contained in:
Dmitry
GitHub
commit
ed1becf35d
36 changed files with 528 additions and 96 deletions
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
|
@ -152,7 +152,7 @@ jobs:
|
|||
- name: 📈 Upload Diff
|
||||
id: upload_diff
|
||||
if: ${{ steps.read_diff.outputs.diff != '' }} && steps.check_pakku_lock_prev.outputs.file_found == 'true'
|
||||
uses: actions/upload-artifact@v4.5.0
|
||||
uses: actions/upload-artifact@v4.6.0
|
||||
with:
|
||||
name: Mods-diff
|
||||
path: PROJECTS_DIFF.md
|
||||
|
|
@ -212,7 +212,7 @@ jobs:
|
|||
mv *.zip $(basename -s .zip *.zip)-curseforge.zip
|
||||
|
||||
- name: 🚀 Upload artifact CurseForge
|
||||
uses: actions/upload-artifact@v4.5.0
|
||||
uses: actions/upload-artifact@v4.6.0
|
||||
with:
|
||||
name: ${{ needs.info.outputs.project_full_name }}-curseforge
|
||||
path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip
|
||||
|
|
@ -224,7 +224,7 @@ jobs:
|
|||
mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
|
||||
|
||||
- name: 🚀 Upload artifact modrinth
|
||||
uses: actions/upload-artifact@v4.5.0
|
||||
uses: actions/upload-artifact@v4.6.0
|
||||
with:
|
||||
name: ${{ needs.info.outputs.project_full_name }}-modrinth
|
||||
path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
|
||||
|
|
@ -267,7 +267,7 @@ jobs:
|
|||
mv *.zip $(basename -s .zip *.zip)-serverpack.zip
|
||||
|
||||
- name: 🚀 Upload artifact server
|
||||
uses: actions/upload-artifact@v4.5.0
|
||||
uses: actions/upload-artifact@v4.6.0
|
||||
with:
|
||||
name: ${{ needs.info.outputs.project_full_name }}-serverpack
|
||||
path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip
|
||||
|
|
@ -317,7 +317,7 @@ jobs:
|
|||
zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/
|
||||
|
||||
- name: 🚀 Upload zip multimc
|
||||
uses: actions/upload-artifact@v4.5.0
|
||||
uses: actions/upload-artifact@v4.6.0
|
||||
with:
|
||||
name: ${{ needs.info.outputs.project_full_name }}-multimc
|
||||
path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip
|
||||
|
|
|
|||
6
defaultconfigs/firmalife-server.toml
Normal file
6
defaultconfigs/firmalife-server.toml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
[general]
|
||||
#If true, the tumbler and the pumping station work magically with a redstone signal and no power required.
|
||||
mechanicalPowerCheatMode = true
|
||||
#If true, sprinkler will not accept firmalife pipes and will instead require something that exposes a fluid capability, eg. a barrel.
|
||||
usePipesForSprinklers = false
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
{
|
||||
"__comment__": "This file was automatically created by mcresources",
|
||||
"name": "Irrigation",
|
||||
"category": "tfc:firmalife",
|
||||
"icon": "firmalife:sprinkler",
|
||||
"pages": [
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above."
|
||||
},
|
||||
{
|
||||
"type": "tfc:anvil_recipe",
|
||||
"recipe": "firmalife:anvil/sprinkler",
|
||||
"text": "The sprinkler is made with a $(thing)Copper Plate$()."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Copper Pipes$() to them. Copper Pipes transport water up to 32 blocks to a sprinkler. They are connected to $(thing)Pumping Stations$()."
|
||||
},
|
||||
{
|
||||
"type": "tfc:anvil_recipe",
|
||||
"recipe": "firmalife:anvil/copper_pipe",
|
||||
"text": "The copper pipe is made with a plate."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:multiblock",
|
||||
"multiblock": {
|
||||
"pattern": [
|
||||
[
|
||||
"X"
|
||||
],
|
||||
[
|
||||
"0"
|
||||
]
|
||||
],
|
||||
"mapping": {
|
||||
"X": "firmalife:pumping_station"
|
||||
}
|
||||
},
|
||||
"name": "",
|
||||
"text": "",
|
||||
"enable_visualize": false
|
||||
},
|
||||
{
|
||||
"type": "patchouli:crafting",
|
||||
"recipe": "tfg:shaped/pumping_station",
|
||||
"text": "Pumping stations must be above a source block of water in order to work. Activate them with a redstone signal."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:crafting",
|
||||
"recipe": "firmalife:crafting/oxidized_copper_pipe",
|
||||
"text": "Oxidized pipes are the same as regular copper pipes, except they do not connect to the other kind of pipe."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:crafting",
|
||||
"recipe": "firmalife:crafting/greenhouse/iron_greenhouse_port",
|
||||
"text": "Greenhouse ports have a single pipe inside of them. They can be used to pass water through the walls of greenhouses!"
|
||||
}
|
||||
],
|
||||
"read_by_default": true,
|
||||
"sortnum": 8
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"name": "Blast Furnace Tips",
|
||||
"icon": "tfc:blast_furnace",
|
||||
"category": "tfc:tfg_tips",
|
||||
"read_by_default": true,
|
||||
"pages":
|
||||
[
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"title": "TerraFirmaCraft Blast Furnace Tips",
|
||||
"text": "So, you finally found that $(item)Kaolinite$() and are probably feeling pretty excited about making a 5-level $(thing)Blast Furnace$(). Here are some tips before you go wild!"
|
||||
},
|
||||
{
|
||||
"type": "patchouli:spotlight",
|
||||
"item": "gtceu:compressed_fireclay",
|
||||
"text": "Before you use all your fire clay on 20 fire bricks, note that once you get into the steam age, you can create fire bricks out of only clay, through $(item)Compressed Fireclay$() (you'll need steam machines for the clay dust). This allows you to save $(item)Kaolinite$() and $(item)Graphite$() for $(thing)Casting Tables$()."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:spotlight",
|
||||
"title": "Preheating Metal",
|
||||
"item": "tfc:firepit",
|
||||
"text": "To convert the iron to steel, the blast furnace must heat the iron inside to $(thing)Brilliant White$(). On the first operation, the metal warms up along with the blast furnace. However, subsequent operations will take a similar amount of time despite the furnace being at temp already, as it needs to heat the metal from cold."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"text": "If the metal is hot when added into the blast furnace, it will take less time to reach brilliant white. Consider heating your metal in a $(l:tfc:mechanics/charcoal_forge)Charcoal Forge$() before putting it into an already-hot furnace to save time, especially with smaller blast furnaces that process less at a time."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:spotlight",
|
||||
"title": "Valid Inputs",
|
||||
"item": "gtceu:iron_dust",
|
||||
"text": "Only certain processing stages of ores are accepted in the blast furnace. $(thing)Ore Dusts$(), $(thing)Raw Ores$(), and $(thing)Cast/Wrought Iron Ingots$() work, while $(thing)Crushed$(), $(thing)Impure$(), or other stages of processing will not. But you really should $(l:tfc:tfg_ores/ore_basics#processing)Process$() your ores to dust."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:spotlight",
|
||||
"title": "Automation",
|
||||
"item": "create:mechanical_pump",
|
||||
"text": "You'll need lots of $(item)Steel$() for the $(thing)Steam$() and $(thing)LV$() ages. Lots of steel. The $(thing)Electric Blast Furnace$() is far off, so maybe think about optimizing your steel production."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"text": "You can pump liquid directly out of the blast furnace using a Create $(item)Mechanical Pump$(). Pump into a $(l:tfc:tfcchannelcasting/channel_casting)Mold Table$() and extract the ingots with a hopper or chute: Easy automation!$(br2)You can automate the bellows with a $(item)Deployer$() too! Just be careful, as using the bellows excessively consumes more fuel and breaks your $(thing)tuyere$() faster.$(br2)You can process the resulting $(item)Pig Iron$() and $(item)High Carbon Steel$() in a $(thing)Forge Hammer$()."
|
||||
},
|
||||
{
|
||||
"type": "patchouli:text",
|
||||
"text": "You can automatically replace broken tuyeres with a hopper facing into the blast furnace."
|
||||
}
|
||||
]
|
||||
}
|
||||
18
kubejs/data/minecraft/tags/items/trim_materials.json
Normal file
18
kubejs/data/minecraft/tags/items/trim_materials.json
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"values": [
|
||||
"minecraft:amethyst_shard",
|
||||
"gtceu:bismuth_ingot",
|
||||
"minecraft:diamond",
|
||||
"minecraft:emerald",
|
||||
"minecraft:gold_ingot",
|
||||
"minecraft:lapis_lazuli",
|
||||
"gtceu:opal_gem",
|
||||
"gtceu:raw_pyrite",
|
||||
"gtceu:rose_gold_ingot",
|
||||
"gtceu:ruby_gem",
|
||||
"gtceu:sapphire_gem",
|
||||
"gtceu:silver_ingot",
|
||||
"gtceu:sterling_silver_ingot",
|
||||
"gtceu:topaz_gem"
|
||||
]
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/amethyst.json
Normal file
9
kubejs/data/minecraft/trim_material/amethyst.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "amethyst_tfc",
|
||||
"description": {
|
||||
"color": "#9A5CC6",
|
||||
"translate": "trim_material.tfc.amethyst"
|
||||
},
|
||||
"ingredient": "minecraft:amethyst_shard",
|
||||
"item_model_index": 0
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/bismuth.json
Normal file
9
kubejs/data/minecraft/trim_material/bismuth.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "bismuth_tfc",
|
||||
"description": {
|
||||
"color": "#8bbbc4",
|
||||
"translate": "trim_material.tfc.bismuth"
|
||||
},
|
||||
"ingredient": "gtceu:bismuth_ingot",
|
||||
"item_model_index": 1
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/diamond.json
Normal file
9
kubejs/data/minecraft/trim_material/diamond.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "diamond_tfc",
|
||||
"description": {
|
||||
"color": "#6EECD2",
|
||||
"translate": "trim_material.tfc.diamond"
|
||||
},
|
||||
"ingredient": "minecraft:diamond",
|
||||
"item_model_index": 0.1
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/emerald.json
Normal file
9
kubejs/data/minecraft/trim_material/emerald.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "emerald_tfc",
|
||||
"description": {
|
||||
"color": "#11A036",
|
||||
"translate": "trim_material.tfc.emerald"
|
||||
},
|
||||
"ingredient": "minecraft:emerald",
|
||||
"item_model_index": 0.2
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/gold.json
Normal file
9
kubejs/data/minecraft/trim_material/gold.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "gold_tfc",
|
||||
"description": {
|
||||
"color": "#DEB12D",
|
||||
"translate": "trim_material.tfc.gold"
|
||||
},
|
||||
"ingredient": "minecraft:gold_ingot",
|
||||
"item_model_index": 0.9
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/lapis.json
Normal file
9
kubejs/data/minecraft/trim_material/lapis.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "lapis",
|
||||
"description": {
|
||||
"color": "#416E97",
|
||||
"translate": "trim_material.minecraft.lapis"
|
||||
},
|
||||
"ingredient": "tfc:gem/lapis_lazuli",
|
||||
"item_model_index": 0.9
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/lapis_lazuli.json
Normal file
9
kubejs/data/minecraft/trim_material/lapis_lazuli.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "lapis_lazuli_tfc",
|
||||
"description": {
|
||||
"color": "#416E97",
|
||||
"translate": "trim_material.tfc.lapis_lazuli"
|
||||
},
|
||||
"ingredient": "minecraft:lapis_lazuli",
|
||||
"item_model_index": 0.3
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/opal.json
Normal file
9
kubejs/data/minecraft/trim_material/opal.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "opal_tfc",
|
||||
"description": {
|
||||
"color": "#75e7eb",
|
||||
"translate": "trim_material.tfc.opal"
|
||||
},
|
||||
"ingredient": "gtceu:opal_gem",
|
||||
"item_model_index": 0.4
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/pyrite.json
Normal file
9
kubejs/data/minecraft/trim_material/pyrite.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "pyrite_tfc",
|
||||
"description": {
|
||||
"color": "#e6c44c",
|
||||
"translate": "trim_material.tfc.pyrite"
|
||||
},
|
||||
"ingredient": "gtceu:raw_pyrite",
|
||||
"item_model_index": 0.4
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/rose_gold.json
Normal file
9
kubejs/data/minecraft/trim_material/rose_gold.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "rose_gold_tfc",
|
||||
"description": {
|
||||
"color": "#fcdd86",
|
||||
"translate": "trim_material.tfc.rose_gold"
|
||||
},
|
||||
"ingredient": "gtceu:rose_gold_ingot",
|
||||
"item_model_index": 0.95
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/ruby.json
Normal file
9
kubejs/data/minecraft/trim_material/ruby.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "ruby_tfc",
|
||||
"description": {
|
||||
"color": "#971607",
|
||||
"translate": "trim_material.tfc.ruby"
|
||||
},
|
||||
"ingredient": "gtceu:ruby_gem",
|
||||
"item_model_index": 0.5
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/sapphire.json
Normal file
9
kubejs/data/minecraft/trim_material/sapphire.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "sapphire_tfc",
|
||||
"description": {
|
||||
"color": "#183dde",
|
||||
"translate": "trim_material.tfc.sapphire"
|
||||
},
|
||||
"ingredient": "gtceu:sapphire_gem",
|
||||
"item_model_index": 0.6
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/silver.json
Normal file
9
kubejs/data/minecraft/trim_material/silver.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "silver_tfc",
|
||||
"description": {
|
||||
"color": "#edeadf",
|
||||
"translate": "trim_material.tfc.silver"
|
||||
},
|
||||
"ingredient": "gtceu:silver_ingot",
|
||||
"item_model_index": 0.8
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/sterling_silver.json
Normal file
9
kubejs/data/minecraft/trim_material/sterling_silver.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "sterling_silver_tfc",
|
||||
"description": {
|
||||
"color": "#ccc7b6",
|
||||
"translate": "trim_material.tfc.sterling_silver"
|
||||
},
|
||||
"ingredient": "gtceu:sterling_silver_ingot",
|
||||
"item_model_index": 0.85
|
||||
}
|
||||
9
kubejs/data/minecraft/trim_material/topaz.json
Normal file
9
kubejs/data/minecraft/trim_material/topaz.json
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"asset_name": "topaz_tfc",
|
||||
"description": {
|
||||
"color": "#c27a0e",
|
||||
"translate": "trim_material.tfc.topaz"
|
||||
},
|
||||
"ingredient": "gtceu:topaz_gem",
|
||||
"item_model_index": 0.7
|
||||
}
|
||||
|
|
@ -1217,4 +1217,96 @@ const registerCreateRecipes = (event) => {
|
|||
.EUt(20)
|
||||
|
||||
//#endregion
|
||||
|
||||
// #region So-called "Shit Glass"
|
||||
|
||||
event.shaped('4x create:framed_glass',
|
||||
[
|
||||
'AA',
|
||||
'AA'
|
||||
], {
|
||||
A: 'minecraft:glass'
|
||||
}).id('tfg:create/framed_glass')
|
||||
|
||||
event.shaped('4x create:tiled_glass',
|
||||
[
|
||||
'A A',
|
||||
' ',
|
||||
'A A'
|
||||
], {
|
||||
A: 'minecraft:glass'
|
||||
}).id('tfg:create/tiled_glass')
|
||||
|
||||
event.shaped('4x create:horizontal_framed_glass',
|
||||
[
|
||||
'AA',
|
||||
' ',
|
||||
'AA'
|
||||
], {
|
||||
A: 'minecraft:glass'
|
||||
}).id('tfg:create/horizontal_framed_glass')
|
||||
|
||||
event.shaped('4x create:vertical_framed_glass',
|
||||
[
|
||||
'A A',
|
||||
'A A'
|
||||
], {
|
||||
A: 'minecraft:glass'
|
||||
}).id('tfg:create/vertical_framed_glass')
|
||||
|
||||
const CREATE_FRAMED_GLASS_WINDOWS =
|
||||
[
|
||||
'framed_glass',
|
||||
'tiled_glass',
|
||||
'horizontal_framed_glass',
|
||||
'vertical_framed_glass'
|
||||
]
|
||||
|
||||
CREATE_FRAMED_GLASS_WINDOWS.forEach(x => {
|
||||
event.shapeless(`2x create:${x}_pane`,
|
||||
[
|
||||
`create:${x}`,
|
||||
'#forge:tools/saws'
|
||||
])
|
||||
.id(`tfg:create/shapeless/${x}_pane`)
|
||||
|
||||
event.recipes.gtceu.cutter(`tfg:create/${x}_pane`)
|
||||
.itemInputs(`3x create:${x}`)
|
||||
.itemOutputs(`8x create:${x}_pane`)
|
||||
.duration(40)
|
||||
.EUt(20)
|
||||
})
|
||||
|
||||
const CREATE_OTHER_GLASS_WINDOWS =
|
||||
[
|
||||
[ 'dark_oak', 'tfc:wood/lumber/hickory' ],
|
||||
[ 'mangrove', 'tfc:wood/lumber/mangrove' ],
|
||||
[ 'ornate_iron', 'gtceu:wrought_iron_rod' ]
|
||||
]
|
||||
|
||||
CREATE_OTHER_GLASS_WINDOWS.forEach(x => {
|
||||
event.shaped(`2x create:${x[0]}_window`,
|
||||
[
|
||||
' B ',
|
||||
'BAB'
|
||||
], {
|
||||
A: 'minecraft:glass',
|
||||
B: x[1]
|
||||
}).id(`tfg:create/shaped/${x[0]}_window`)
|
||||
|
||||
event.shapeless(`2x create:${x[0]}_window_pane`,
|
||||
[
|
||||
`create:${x[0]}_window`,
|
||||
'#forge:tools/saws'
|
||||
])
|
||||
.id(`tfg:create/shapeless/${x[0]}_window_pane`)
|
||||
|
||||
event.recipes.gtceu.cutter(`tfg:create/${x[0]}_window_pane`)
|
||||
.itemInputs(`3x create:${x[0]}_window`)
|
||||
.itemOutputs(`8x create:${x[0]}_window_pane`)
|
||||
.duration(40)
|
||||
.EUt(20)
|
||||
})
|
||||
|
||||
// #endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ const registerCreateItemTags = (event) => {
|
|||
|
||||
if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`)
|
||||
})
|
||||
|
||||
event.add('minecraft:trimmable_armor', 'create:copper_diving_helmet')
|
||||
event.add('minecraft:trimmable_armor', 'create:copper_diving_boots')
|
||||
}
|
||||
|
||||
const registerCreateBlockTags = (event) => {
|
||||
|
|
@ -41,4 +44,4 @@ const registerCreateFluidTags = (event) => {
|
|||
// Добавляем тег для скрытия в EMI
|
||||
event.add('c:hidden_from_recipe_viewers', 'create:chocolate')
|
||||
event.add('c:hidden_from_recipe_viewers', 'create:honey')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
22
kubejs/server_scripts/every_compat/recipes.js
Normal file
22
kubejs/server_scripts/every_compat/recipes.js
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// priority: 0
|
||||
|
||||
const registerEveryCompatRecipes = (event) => {
|
||||
|
||||
global.TFC_WOOD_TYPES.forEach(wood =>
|
||||
{
|
||||
event.remove({ id: `everycomp:c/tfc/${wood}_window_pane` })
|
||||
|
||||
event.shapeless(`2x everycomp:c/tfc/${wood}_window_pane`,
|
||||
[
|
||||
`everycomp:c/tfc/${wood}_window`,
|
||||
'#forge:tools/saws'
|
||||
])
|
||||
.id(`tfg:everycompat/shapeless/${wood}_window_pane`)
|
||||
|
||||
event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`)
|
||||
.itemInputs(`3x everycomp:c/tfc/${wood}_window`)
|
||||
.itemOutputs(`8x everycomp:c/tfc/${wood}_window_pane`)
|
||||
.duration(40)
|
||||
.EUt(20)
|
||||
})
|
||||
}
|
||||
9
kubejs/server_scripts/every_compat/tags.js
Normal file
9
kubejs/server_scripts/every_compat/tags.js
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
// priority: 0
|
||||
|
||||
const registerEveryCompatItemTags = (event) => {
|
||||
|
||||
event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window')
|
||||
event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window_pane')
|
||||
event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window')
|
||||
event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window_pane')
|
||||
}
|
||||
|
|
@ -134,6 +134,56 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
//#region Рецепты теплиц
|
||||
|
||||
//#region Медная
|
||||
|
||||
event.shaped('firmalife:pumping_station',
|
||||
[
|
||||
' B ',
|
||||
'ACA',
|
||||
' D '
|
||||
], {
|
||||
A: 'firmalife:copper_pipe',
|
||||
B: 'gtceu:bronze_plate',
|
||||
C: '#tfc:barrels',
|
||||
D: 'create:mechanical_pump'
|
||||
}).id('tfg:shaped/pumping_station')
|
||||
|
||||
event.shaped('firmalife:pumping_station',
|
||||
[
|
||||
' B ',
|
||||
'ACA',
|
||||
' D '
|
||||
], {
|
||||
A: 'firmalife:copper_pipe',
|
||||
B: 'gtceu:black_bronze_plate',
|
||||
C: '#tfc:barrels',
|
||||
D: 'create:mechanical_pump'
|
||||
}).id('tfg:shaped/pumping_station2')
|
||||
|
||||
event.shaped('firmalife:pumping_station',
|
||||
[
|
||||
' B ',
|
||||
'ACA',
|
||||
' D '
|
||||
], {
|
||||
A: 'firmalife:copper_pipe',
|
||||
B: 'gtceu:bismuth_bronze_plate',
|
||||
C: '#tfc:barrels',
|
||||
D: 'create:mechanical_pump'
|
||||
}).id('tfg:shaped/pumping_station3')
|
||||
|
||||
event.recipes.gtceu.bender('tfg:firmalife/copper_pipe')
|
||||
.itemInputs('gtceu:copper_plate')
|
||||
.itemOutputs('8x firmalife:copper_pipe')
|
||||
.circuit(3)
|
||||
.duration(40)
|
||||
.EUt(8)
|
||||
|
||||
event.recipes.gtceu.bender('tfg:firmalife/sprinkler')
|
||||
.itemInputs('gtceu:copper_plate')
|
||||
.itemOutputs('firmalife:sprinkler')
|
||||
.circuit(4)
|
||||
.duration(60)
|
||||
.EUt(8)
|
||||
|
||||
// Стена
|
||||
event.shaped('8x firmalife:copper_greenhouse_wall', [
|
||||
|
|
@ -204,7 +254,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
}).id('firmalife:crafting/greenhouse/copper_greenhouse_door')
|
||||
|
||||
// Порт
|
||||
event.shaped('8x firmalife:copper_greenhouse_port', [
|
||||
event.shaped('firmalife:copper_greenhouse_port', [
|
||||
'AA',
|
||||
'BC',
|
||||
'AA'
|
||||
|
|
@ -287,7 +337,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
}).id('firmalife:crafting/greenhouse/iron_greenhouse_door')
|
||||
|
||||
// Порт
|
||||
event.shaped('8x firmalife:iron_greenhouse_port', [
|
||||
event.shaped('firmalife:iron_greenhouse_port', [
|
||||
'AA',
|
||||
'BC',
|
||||
'AA'
|
||||
|
|
@ -367,6 +417,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
.itemOutputs(element.output)
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(2)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
|
@ -411,6 +462,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
.itemOutputs('firmalife:food/pumpkin_pie_dough')
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(2)
|
||||
|
||||
event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]
|
||||
).id('firmalife:create/mixer/food/pumpkin_pie_dough')
|
||||
|
|
@ -433,6 +485,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
.itemOutputs('firmalife:food/pie_dough')
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(2)
|
||||
|
||||
event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)])
|
||||
.id('firmalife:create/mixer/food/pie_dough')
|
||||
|
|
@ -454,6 +507,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
.itemOutputs('4x firmalife:food/hardtack_dough')
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(2)
|
||||
|
||||
event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)])
|
||||
.id('firmalife:create/mixer/food/hardtack_dough')
|
||||
|
|
@ -465,6 +519,7 @@ const registerFirmaLifeRecipes = (event) => {
|
|||
.outputFluids('firmalife:yeast_starter', 600)
|
||||
.duration(1200)
|
||||
.EUt(8)
|
||||
.circuit(1)
|
||||
|
||||
event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)])
|
||||
.id('firmalife:create/mixer/yeast_starter')
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ const registerFirmaLifeItemTags = (event) => {
|
|||
event.add('c:hidden_from_recipe_viewers', item)
|
||||
})
|
||||
|
||||
event.add('minecraft:trimmable_armor', '#firmalife:beekeeper_armor')
|
||||
|
||||
// Удаление тегов у руд
|
||||
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
|
||||
}
|
||||
|
|
@ -38,4 +40,4 @@ const registerFirmaLifeFluidTags = (event) => {
|
|||
const registerFirmaLifePlacedFeatures = (event) => {
|
||||
event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite')
|
||||
event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ const registerGTCEUItemTags = (event) => {
|
|||
event.add('c:hidden_from_recipe_viewers', item)
|
||||
})
|
||||
|
||||
global.GTCEU_ARMORS.forEach(item => {
|
||||
event.add('minecraft:trimmable_armor', item)
|
||||
})
|
||||
|
||||
// Добавление тега EMI для скрытия всех руд
|
||||
event.add('c:hidden_from_recipe_viewers', '#forge:ores')
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ ServerEvents.tags('item', event => {
|
|||
registerCreateItemTags(event)
|
||||
registerCreateAdditionsItemTags(event)
|
||||
registerCreateConnectedItemTags(event)
|
||||
registerEveryCompatItemTags(event)
|
||||
registerExtendedAE2ItemTags(event)
|
||||
registerFirmaCivItemTags(event)
|
||||
registerFirmaLifeItemTags(event)
|
||||
|
|
@ -23,6 +24,7 @@ ServerEvents.tags('item', event => {
|
|||
registerHotOrNotItemTags(event)
|
||||
registerRailWaysItemTags(event)
|
||||
registerSophisticatedBackpacksItemTags(event)
|
||||
registerTFCAmbientalItemTags(event)
|
||||
registerTFCItemTags(event)
|
||||
})
|
||||
|
||||
|
|
@ -119,6 +121,7 @@ ServerEvents.recipes(event => {
|
|||
registerCreateRecipes(event)
|
||||
registerCreateAdditionsRecipes(event)
|
||||
registerCreateConnectedRecipes(event)
|
||||
registerEveryCompatRecipes(event)
|
||||
registerExtendedAE2Recipes(event)
|
||||
registerExposureRecipes(event)
|
||||
registerEtchedRecipes(event)
|
||||
|
|
@ -141,4 +144,4 @@ ServerEvents.recipes(event => {
|
|||
registerToolBeltRecipes(event)
|
||||
registerTreeTapRecipes(event)
|
||||
registerWaterFlasksRecipes(event)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2206,9 +2206,8 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#region Выход: Тонированное стекло
|
||||
|
||||
event.recipes.gtceu.chemical_bath('tfg:minecraft/tinted_glass')
|
||||
.itemInputs('minecraft:glass')
|
||||
.inputFluids(Fluid.of('gtceu:black_dye', 144))
|
||||
event.recipes.gtceu.alloy_smelter('tfg:minecraft/tinted_glass')
|
||||
.itemInputs('minecraft:glass', 'tfc:powder/amethyst')
|
||||
.itemOutputs('minecraft:tinted_glass')
|
||||
.duration(260)
|
||||
.EUt(16)
|
||||
|
|
@ -2337,27 +2336,6 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Шаблоны брони
|
||||
|
||||
event.remove({id: 'minecraft:wild_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:wayfinder_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:ward_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:vex_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:tide_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:spire_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:snout_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:silence_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:shaper_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:sentry_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:rib_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:raiser_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:host_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:eye_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:dune_armor_trim_smithing_template_smithing_trim'})
|
||||
event.remove({id: 'minecraft:coast_armor_trim_smithing_template_smithing_trim'})
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Кольчуга
|
||||
|
||||
event.remove({id: 'gtceu:shaped/chainmail_boots'})
|
||||
|
|
@ -2506,28 +2484,6 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Шаблоны брони
|
||||
|
||||
event.remove({ id: 'minecraft:coast_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:vex_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:host_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:rib_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:spire_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:tide_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:eye_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:raiser_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:wild_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:shaper_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:snout_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:dune_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:netherite_upgrade_smithing_template' })
|
||||
event.remove({ id: 'minecraft:wayfinder_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:ward_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:silence_armor_trim_smithing_template' })
|
||||
event.remove({ id: 'minecraft:sentry_armor_trim_smithing_template' })
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Компаратор
|
||||
|
||||
event.remove({id: 'minecraft:comparator'})
|
||||
|
|
@ -3270,4 +3226,8 @@ const registerMinecraftRecipes = (event) => {
|
|||
.EUt(32)
|
||||
|
||||
//#endregion
|
||||
|
||||
// Nether Brick
|
||||
|
||||
event.smelting('minecraft:nether_brick', 'minecraft:netherrack')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3001,6 +3001,7 @@ const registerTFCRecipes = (event) => {
|
|||
.itemOutputs(element.output)
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(3)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
|
|
|||
|
|
@ -54,6 +54,9 @@ const registerTFCItemTags = (event) => {
|
|||
event.add('minecraft:logs_that_burn', `#tfc:${woodType}_logs`)
|
||||
})
|
||||
|
||||
// Allows TFC stick bundles to be burned in the coke/pyrolyse ovens
|
||||
event.add("minecraft:logs_that_burn", "tfc:stick_bundle");
|
||||
|
||||
// Определеяет какое оружие может появиться у зомбя/скелета в руках
|
||||
// Мечи
|
||||
event.add('tfc:mob_mainhand_weapons', 'gtceu:bismuth_bronze_sword')
|
||||
|
|
|
|||
21
kubejs/server_scripts/tfcambiental/tags.js
Normal file
21
kubejs/server_scripts/tfcambiental/tags.js
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
// priority: 0
|
||||
|
||||
const registerTFCAmbientalItemTags = (event) => {
|
||||
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:wool_hat')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:wool_sweater')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:wool_pants')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:wool_boots')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:silk_cowl')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:silk_shirt')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:silk_pants')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:silk_shoes')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_cowl')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_shirt')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_pants')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:burlap_shoes')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_hat')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_tunic')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_pants')
|
||||
event.add('minecraft:trimmable_armor', 'tfcambiental:insulated_leather_boots')
|
||||
}
|
||||
|
|
@ -322,33 +322,20 @@ global.CREATE_DISABLED_ITEMS = [
|
|||
'create:granite_pillar',
|
||||
|
||||
// Shit Glass
|
||||
'create:tiled_glass',
|
||||
'create:framed_glass',
|
||||
'create:horizontal_framed_glass',
|
||||
'create:vertical_framed_glass',
|
||||
'create:tiled_glass_pane',
|
||||
'create:horizontal_framed_glass_pane',
|
||||
'create:vertical_framed_glass_pane',
|
||||
'create:crimson_window',
|
||||
'create:warped_window',
|
||||
'create:oak_window',
|
||||
'create:spruce_window',
|
||||
'create:birch_window',
|
||||
'create:jungle_window',
|
||||
'create:acacia_window',
|
||||
'create:dark_oak_window',
|
||||
'create:mangrove_window',
|
||||
'create:crimson_window',
|
||||
'create:warped_window',
|
||||
'create:ornate_iron_window',
|
||||
'create:oak_window_pane',
|
||||
'create:spruce_window_pane',
|
||||
'create:birch_window_pane',
|
||||
'create:jungle_window_pane',
|
||||
'create:acacia_window_pane',
|
||||
'create:dark_oak_window_pane',
|
||||
'create:mangrove_window_pane',
|
||||
'create:crimson_window_pane',
|
||||
'create:crimson_window_pane',
|
||||
'create:warped_window_pane',
|
||||
'create:ornate_iron_window_pane',
|
||||
|
||||
// Blocks
|
||||
'create:zinc_block',
|
||||
|
|
@ -468,6 +455,5 @@ global.CREATE_DISABLED_ITEMS = [
|
|||
'create:empty_blaze_burner',
|
||||
'create:minecart_contraption',
|
||||
'create:furnace_minecart_contraption',
|
||||
'create:chest_minecart_contraption',
|
||||
'create:framed_glass_pane'
|
||||
];
|
||||
'create:chest_minecart_contraption'
|
||||
];
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ global.FIRMALIFE_DISABLED_ITEMS = [
|
|||
'firmalife:metal/block/stainless_steel_slab',
|
||||
|
||||
// Other
|
||||
'firmalife:compost_tumbler',
|
||||
'firmalife:pumping_station'
|
||||
'firmalife:compost_tumbler'
|
||||
];
|
||||
|
||||
global.FIRMALIFE_HIDED_ITEMS = [
|
||||
|
|
@ -130,4 +129,4 @@ global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [
|
|||
{ input: 'tfc:food/rice_dough', output: 'firmalife:food/rice_flatbread', name: 'rice_flatbread' },
|
||||
{ input: 'tfc:food/wheat_dough', output: 'firmalife:food/wheat_flatbread', name: 'wheat_flatbread' },
|
||||
{ input: 'firmalife:food/masa', output: 'firmalife:food/corn_tortilla', name: 'corn_tortilla' },
|
||||
];
|
||||
];
|
||||
|
|
|
|||
|
|
@ -52,4 +52,22 @@ global.GTCEU_HIDED_ITEMS = [
|
|||
'gtceu:netherrack_dust',
|
||||
'gtceu:small_netherrack_dust',
|
||||
'gtceu:tiny_netherrack_dust'
|
||||
];
|
||||
];
|
||||
|
||||
global.GTCEU_ARMORS = [
|
||||
'gtceu:hazmat_chestpiece',
|
||||
'gtceu:hazmat_leggings',
|
||||
'gtceu:hazmat_boots',
|
||||
'gtceu:hazmat_headpiece',
|
||||
'gtceu:nanomuscle_chestplate',
|
||||
'gtceu:nanomuscle_leggings',
|
||||
'gtceu:nanomuscle_boots',
|
||||
'gtceu:nanomuscle_helmet',
|
||||
// typo in gtceu
|
||||
'gtceu:avanced_nanomuscle_chestplate',
|
||||
'gtceu:quarktech_chestplate',
|
||||
'gtceu:quarktech_leggings',
|
||||
'gtceu:quarktech_boots',
|
||||
'gtceu:quarktech_helmet',
|
||||
'gtceu:advanced_quarktech_chestplate'
|
||||
];
|
||||
|
|
|
|||
|
|
@ -491,23 +491,7 @@ global.MINECRAFT_DISABLED_ITEMS = [
|
|||
'minecraft:burn_pottery_sherd',
|
||||
|
||||
// Шаблоны брони
|
||||
/*'minecraft:wayfinder_armor_trim_smithing_template',
|
||||
'minecraft:dune_armor_trim_smithing_template',
|
||||
'minecraft:snout_armor_trim_smithing_template',
|
||||
'minecraft:shaper_armor_trim_smithing_template',
|
||||
'minecraft:coast_armor_trim_smithing_template',
|
||||
'minecraft:vex_armor_trim_smithing_template',
|
||||
'minecraft:host_armor_trim_smithing_template',
|
||||
'minecraft:rib_armor_trim_smithing_template',
|
||||
'minecraft:silence_armor_trim_smithing_template',
|
||||
'minecraft:spire_armor_trim_smithing_template',
|
||||
'minecraft:tide_armor_trim_smithing_template',
|
||||
'minecraft:eye_armor_trim_smithing_template',
|
||||
'minecraft:raiser_armor_trim_smithing_template',
|
||||
'minecraft:wild_armor_trim_smithing_template',
|
||||
'minecraft:sentry_armor_trim_smithing_template',
|
||||
'minecraft:ward_armor_trim_smithing_template',*/
|
||||
'minecraft:netherite_upgrade_smithing_template',
|
||||
'minecraft:netherite_upgrade_smithing_template',
|
||||
|
||||
// Свечи
|
||||
'minecraft:candle',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue