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

Merge pull request #1404 from TerraFirmaGreg-Team/dev

Browse source 
Release: 0.10.2
This commit is contained in:
Xikaro 2025-07-20 17:50:53 +05:00 • committed by GitHub
commit 27a528ef90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 2252 additions and 2217 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/README.md vendored
View file

@ -64,9 +64,10 @@ Want to help translate? Please read [this](../kubejs/README%20IF%20TRANSLATING.m
<h2 align="center">External Credits and Special Thanks</h2>
- WithersChat from the Monifactory team for the universal circuit textures.
- GregTech Community Pack Modern for most of their quest text.
- Better End for some assets.
- WithersChat from the [Monifactory](https://www.curseforge.com/minecraft/modpacks/monifactory) team for the universal circuit textures.
- [GregTech Community Pack Modern](https://www.curseforge.com/minecraft/modpacks/gregtech-community-pack-modern) for most of their quest text.
- [Better End](https://www.curseforge.com/minecraft/mc-mods/betterend) for some assets.
- Uni for Mars' dunes terrain generation.
<!-- Links: -->
[TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft

88
.github/workflows/build.yml vendored
View file

@ -58,7 +58,7 @@ jobs:
id: latest_tag
shell: bash
run: |
tag=$(git describe --tags --abbrev=0)
tag=$(git describe --tags --abbrev=0 origin/main)
if [ -z "$tag" ]; then
echo "❌ Latest tag not found" && exit 1
else
@ -135,12 +135,6 @@ jobs:
with:
file_path: "pakku-lock.json"
- name: 🔍 Check if tag exists
uses: mukunku/tag-exists-action@v1.6.0
id: check_tag
with:
tag: ${{ steps.pakku_info.outputs.version }}
- name: 📄 Changelog Dev Parser
id: changelog_dev
if: ${{ env.DEV_ENVIRONMENT == 'true' }}
@ -157,6 +151,12 @@ jobs:
path: CHANGELOG.md
continue-on-error: true
- name: 🔍 Check if tag exists
uses: mukunku/tag-exists-action@v1.6.0
id: check_tag
with:
tag: ${{ steps.changelog.outputs.version }}
- name: 🔍 Check
id: check
shell: bash
@ -185,6 +185,27 @@ jobs:
```markdown
${{ steps.read_diff.outputs.diff }}
```
- name: 🔍 Create Pull Request if tag not found
id: create_pr
if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true'}}
uses: devops-infra/action-pull-request@v0.6.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: dev
target_branch: main
title: 'Release: ${{ steps.changelog.outputs.version }}'
body: |
**This is an automated Pull Request from the dev branch.**
📃 **Name**: ${{ steps.check.outputs.project_name }}
📃 **Release**: `${{ steps.changelog.outputs.version }}`
📃 **Release Type**: `${{ steps.pakku_info.outputs.release_type }}`
📃 **Game Version**: `${{ steps.check.outputs.minecraft_version }}`
${{ steps.changelog.outputs.description }}
reviewer: Xikaro
ignore_users: "dependabot"
- name: 📝 Generate Github Summary
uses: WcAServices/markdown-template-action@v1.1.1
@ -246,48 +267,17 @@ jobs:
path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip
if-no-files-found: error
# - name: 📁 Rename artifact modrinth
# run: |
# cd ./build/modrinth/
# mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
# - name: 🚀 Upload artifact modrinth
# uses: actions/upload-artifact@v4.6.2
# with:
# name: ${{ needs.info.outputs.project_full_name }}-modrinth
# path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
# if-no-files-found: warn
build-server:
name: 📦 Build Server
needs: [info]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.2.2
- name: 🔄 Replace strings
shell: bash
- name: 📁 Rename artifact modrinth
run: |
set +e
cd ./build/modrinth/
mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
VERSION=${{ needs.info.outputs.project_version }}
sed -i -e "s/DEV/${VERSION}/g" pakku.json
sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
- name: 📝 Cache pakku
uses: actions/cache@v4.2.3
id: cache
- name: 🚀 Upload artifact modrinth
uses: actions/upload-artifact@v4.6.2
with:
path: build/.cache
key: pakku-cache-${{ hashFiles('pakku-lock.json') }}
restore-keys: pakku-cache-
- name: 📦 Export modpack
run: |
mv -vf ./.pakku/server-overrides/* ./
curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J
java -jar pakku.jar export
name: ${{ needs.info.outputs.project_full_name }}-modrinth
path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
if-no-files-found: warn
- name: 📁 Rename artifact server
run: |
@ -354,7 +344,7 @@ jobs:
release-github:
name: 🚀 Release to GitHub
needs: [info, build-modpack, build-server, build-multimc]
needs: [info, build-modpack, build-multimc]
runs-on: ubuntu-latest
if: ${{ needs.info.outputs.make_release == 'true' }}
outputs:
@ -424,7 +414,7 @@ jobs:
release-curseforge:
name: 🚀 Release to CurseForge
needs: [info, build-modpack, build-server, release-github]
needs: [info, build-modpack, release-github]
runs-on: ubuntu-latest
if: ${{ needs.info.outputs.make_release == 'true' }}
outputs:
@ -474,7 +464,7 @@ jobs:
release-modrinth:
name: 🚀 Release to Modrinth
needs: [info, build-modpack, build-server, release-github]
needs: [info, build-modpack, release-github]
runs-on: ubuntu-latest
if: false
outputs:

8
CHANGELOG.md
View file

@ -1,6 +1,14 @@
# Changelog
## [Unreleased]
## [0.10.2] - 20-07-2025
### Changes
- Aged Corn Whiskey and Aged Rye Whiskey now have status effects (#1390) @EveProgrammingsockson
### Bug fixes
- Fixed TFG-Core version mismatch @Xikaro
- Fixed hardwood logs macerating into softwood pulp (#1391) @Forsuin
- Fixed iron flask dupe (#1397) @Pyritie
- Fixed amethyst/nether quartz dupe (#1395) @Pyritie
## [0.10.1] - 19-07-2025
### Changes

2
kubejs/assets/ad_astra/lang/en_us.json
View file

@ -24,7 +24,7 @@
"block.ad_astra.moon_deepslate": "Raw Norite",
"block.ad_astra.cheese_block": "Moon Cheese Block",
"block.ad_astra.moon_cheese_ore": "Anorthosite Cheese Ore",
"block.ad_astra.mars_sand": "Martian Sand",
"block.ad_astra.mars_sand": "Argillite Sand",
"block.ad_astra.mars_stone": "Raw Argillite",
"block.ad_astra.mars_cobblestone": "Argillite Cobble",
"block.ad_astra.mars_cobblestone_slab": "Argillite Cobble Slab",

2
kubejs/assets/ad_astra/lang/uk_ua.json
View file

@ -24,7 +24,7 @@
"block.ad_astra.moon_deepslate": "Сирий Норит",
"block.ad_astra.cheese_block": "Місячний сирний блок",
"block.ad_astra.moon_cheese_ore": "Анортоцитовий Сирна Руда",
"block.ad_astra.mars_sand": "Марсіанський пісок",
"block.ad_astra.mars_sand": "Аргілітовий пісок",
"block.ad_astra.mars_stone": "Сирий Аргіліт",
"block.ad_astra.mars_cobblestone": "Аргілітовий брук",
"block.ad_astra.mars_cobblestone_slab": "Аргілітова бруківна плита",

7
kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/electromagnetic_accelerator"
}
}
}

7
kubejs/assets/tfg/blockstates/superconductor_coil_large.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/superconductor_coil_large"
}
}
}

7
kubejs/assets/tfg/blockstates/superconductor_coil_small.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/superconductor_coil_small"
}
}
}

3
kubejs/assets/tfg/lang/en_us.json
View file

@ -282,6 +282,9 @@
"block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs",
"block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone",
"block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone",
"block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator",
"block.tfg.superconductor_coil_large": "Large Superconductor Coil",
"block.tfg.superconductor_coil_small": "Small Superconductor Coil",
"tfg:nether_slurry": "Nether Slurry",
"tfg:enriched_nether_slurry": "Enriched Nether Slurry",
"tfg:ender_slurry": "Ender Slurry",

1
kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/electromagnetic_accelerator"}}

1
kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_large"}}

1
kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_small"}}

3
kubejs/assets/tfg/models/item/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/electromagnetic_accelerator"
}

3
kubejs/assets/tfg/models/item/superconductor_coil_large.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/superconductor_coil_large"
}

3
kubejs/assets/tfg/models/item/superconductor_coil_small.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/superconductor_coil_small"
}

BIN
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7 KiB

12
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta Normal file
View file

@ -0,0 +1,12 @@
{
"animation": {
"frametime": 1
},
"ldlib": {
"connection": "tfg:block/casings/electromagnetic_accelerator_ctm",
"emissive": true
},
"shimmer": {
"bloom": true
}
}

BIN
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

8
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta Normal file
View file

@ -0,0 +1,8 @@
{
"animation": {
"frametime": 1
},
"shimmer": {
"bloom": true
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 566 B

5
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"ldlib": {
"connection": "tfg:block/casings/superconductor_coil_large_ctm"
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 816 B

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 524 B

5
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"ldlib": {
"connection": "tfg:block/casings/superconductor_coil_small_ctm"
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 631 B

13
kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json Normal file
View file

@ -0,0 +1,13 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": "tfcagedalcohol:aged_corn_whiskey",
"thirst": 15,
"intoxication": 2000,
"effects": [
{
"type": "minecraft:haste",
"duration": 6400,
"amplifier": 0
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json Normal file
View file

@ -0,0 +1,13 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": "tfcagedalcohol:aged_rye_whiskey",
"thirst": 15,
"intoxication": 2000,
"effects": [
{
"type": "minecraft:haste",
"duration": 6400,
"amplifier": 0
}
]
}

5
kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json
View file

@ -33,10 +33,7 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",

5
kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
View file

@ -33,10 +33,7 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",

5
kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
View file

@ -33,10 +33,7 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",

70
kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json
View file

@ -1,70 +0,0 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:min",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:add",
"argument1": 0.37,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:cave_entrance",
"xz_scale": 0.5,
"y_scale": 0.25
}
},
"argument2": {
"type": "minecraft:y_clamped_gradient",
"from_value": 0.2,
"from_y": -10,
"to_value": 0,
"to_y": 30
}
},
"argument2": {
"type": "minecraft:add",
"argument1": "minecraft:overworld/caves/spaghetti_roughness_function",
"argument2": {
"type": "minecraft:clamp",
"input": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_3d_rarity",
"xz_scale": 2,
"y_scale": 1
}
},
"noise": "minecraft:spaghetti_3d_1",
"rarity_value_mapper": "type_1"
},
"argument2": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_3d_rarity",
"xz_scale": 2,
"y_scale": 1
}
},
"noise": "minecraft:spaghetti_3d_2",
"rarity_value_mapper": "type_1"
}
},
"argument2": 0
},
"max": 1,
"min": -1
}
}
}
}

94
kubejs/data/tfg/worldgen/density_function/mars/caves/noodle.json
View file

@ -1,94 +0,0 @@
{
"type": "minecraft:range_choice",
"input": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -30.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle",
"xz_scale": 1.0,
"y_scale": 1.0
},
"when_out_of_range": -1.0
}
},
"max_exclusive": 0.0,
"min_inclusive": -1000000.0,
"when_in_range": 64.0,
"when_out_of_range": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:add",
"argument1": -0.07500000000000001,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.025,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_thickness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
},
"when_out_of_range": 0.0
}
},
"argument2": {
"type": "minecraft:mul",
"argument1": 1.5,
"argument2": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_ridge_a",
"xz_scale": 2.6666666666666665,
"y_scale": 2.6666666666666665
},
"when_out_of_range": 0.0
}
}
},
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_ridge_b",
"xz_scale": 2.6666666666666665,
"y_scale": 2.6666666666666665
},
"when_out_of_range": 0.0
}
}
}
}
}
}
}

50
kubejs/data/tfg/worldgen/density_function/mars/caves/pillars.json
View file

@ -1,50 +0,0 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:mul",
"argument1": 2.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar",
"xz_scale": 25.0,
"y_scale": 0.3
}
},
"argument2": {
"type": "minecraft:add",
"argument1": -1.0,
"argument2": {
"type": "minecraft:mul",
"argument1": -1.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar_rareness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
},
"argument2": {
"type": "minecraft:cube",
"argument": {
"type": "minecraft:add",
"argument1": 0.55,
"argument2": {
"type": "minecraft:mul",
"argument1": 0.55,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar_thickness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
}
}
}

61
kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d.json
View file

@ -1,61 +0,0 @@
{
"type": "minecraft:clamp",
"input": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_modulator",
"xz_scale": 2.0,
"y_scale": 1.0
},
"noise": "minecraft:spaghetti_2d",
"rarity_value_mapper": "type_2"
},
"argument2": {
"type": "minecraft:mul",
"argument1": 0.083,
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
}
},
"argument2": {
"type": "minecraft:cube",
"argument": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:add",
"argument1": 0.0,
"argument2": {
"type": "minecraft:mul",
"argument1": 8.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_elevation",
"xz_scale": 1.0,
"y_scale": 0.0
}
}
},
"argument2": {
"type": "minecraft:y_clamped_gradient",
"from_value": 8.0,
"from_y": -32,
"to_value": -20.0,
"to_y": 320
}
}
},
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
}
}
},
"max": 1.0,
"min": -1.0
}

17
kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d_thickness_modulator.json
View file

@ -1,17 +0,0 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:add",
"argument1": -0.95,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.35000000000000003,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_thickness",
"xz_scale": 2.0,
"y_scale": 1.0
}
}
}
}

33
kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json
View file

@ -1,33 +0,0 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:add",
"argument1": -0.05,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.02,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_roughness_modulator",
"xz_scale": 1,
"y_scale": 1
}
}
},
"argument2": {
"type": "minecraft:add",
"argument1": -0.6,
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_roughness",
"xz_scale": 0.4,
"y_scale": 0.4
}
}
}
}
}

16
kubejs/data/tfg/worldgen/density_function/mars/dune.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:mul",
"argument1": -1,
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:noise",
"noise": "tfg:mars_dunes_size",
"xz_scale": 1,
"y_scale": 0
}
}
}
}

26
kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_x.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:spline",
"spline": {
"coordinate": {
"type": "minecraft:noise",
"noise": "tfg:mars_dunes_offset",
"xz_scale": 1,
"y_scale": 0
},
"points": [
{
"location": -1,
"derivative": 5.196152422706632,
"value": 0
},
{
"location": 1,
"derivative": 5.196152422706632,
"value": 0
}
]
}
}
}

31
kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_z.json Normal file
View file

@ -0,0 +1,31 @@
{
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:spline",
"spline": {
"coordinate": {
"type": "minecraft:noise",
"noise": "tfg:mars_dunes_offset",
"xz_scale": 1,
"y_scale": 0
},
"points": [
{
"location": -1,
"derivative": 0,
"value": -1
},
{
"location": 0,
"derivative": 0,
"value": 1
},
{
"location": 1,
"derivative": 0,
"value": -1
}
]
}
}
}

2
kubejs/data/tfg/worldgen/density_function/mars/factor.json
View file

@ -21,7 +21,7 @@
{
"derivative": 0.0,
"location": -0.19,
"value": 3.95
"value": 6
},
{
"derivative": 0.0,

3136
kubejs/data/tfg/worldgen/density_function/mars/offset.json
View file

File diff suppressed because it is too large Load diff

16
kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:mul",
"argument1": -1,
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:noise",
"noise": "tfg:mars_dunes_size",
"xz_scale": 1,
"y_scale": 0
}
}
}
}

14
kubejs/data/tfg/worldgen/noise/mars_dunes_color.json Normal file
View file

@ -0,0 +1,14 @@
{
"amplitudes": [
1,
1,
2,
2,
2,
1,
1,
1,
1
],
"firstOctave": -8
}

6
kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json Normal file
View file

@ -0,0 +1,6 @@
{
"firstOctave": -11,
"amplitudes": [
1
]
}

6
kubejs/data/tfg/worldgen/noise/mars_dunes_size.json Normal file
View file

@ -0,0 +1,6 @@
{
"firstOctave": -7,
"amplitudes": [
0.5
]
}

348
kubejs/data/tfg/worldgen/noise_settings/mars_noise.json
View file

@ -14,7 +14,7 @@
"min_y": -32,
"height": 384,
"size_horizontal": 1,
"size_vertical": 2
"size_vertical": 1
},
"noise_router": {
"barrier": {
@ -44,10 +44,10 @@
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:y_clamped_gradient",
"from_value": 0.0,
"from_y": -32,
"to_value": 1.0,
"to_y": -20
"to_y": -20,
"from_value": 0,
"to_value": 1
},
"argument2": {
"type": "minecraft:add",
@ -59,100 +59,15 @@
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:y_clamped_gradient",
"from_value": 1.0,
"from_y": 240,
"to_value": 0.0,
"to_y": 256
"to_y": 256,
"from_value": 1,
"to_value": 0
},
"argument2": {
"type": "minecraft:add",
"argument1": 0.078125,
"argument2": {
"type": "minecraft:range_choice",
"input": "tfg:mars/sloped_cheese",
"max_exclusive": 1.5625,
"min_inclusive": -1000000.0,
"when_in_range": {
"type": "minecraft:min",
"argument1": "tfg:mars/sloped_cheese",
"argument2": {
"type": "minecraft:mul",
"argument1": 5.0,
"argument2": "tfg:mars/caves/entrances"
}
},
"when_out_of_range": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:min",
"argument1": {
"type": "minecraft:min",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:mul",
"argument1": 4.0,
"argument2": {
"type": "minecraft:square",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:cave_layer",
"xz_scale": 1.0,
"y_scale": 8.0
}
}
},
"argument2": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:clamp",
"input": {
"type": "minecraft:add",
"argument1": 0.27,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:cave_cheese",
"xz_scale": 1.0,
"y_scale": 0.6666666666666666
}
},
"max": 1.0,
"min": -1.0
},
"argument2": {
"type": "minecraft:clamp",
"input": {
"type": "minecraft:add",
"argument1": 1.5,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.64,
"argument2": "tfg:mars/sloped_cheese"
}
},
"max": 0.5,
"min": 0.0
}
}
},
"argument2": "tfg:mars/caves/entrances"
},
"argument2": {
"type": "minecraft:add",
"argument1": "tfg:mars/caves/spaghetti_2d",
"argument2": "tfg:mars/caves/spaghetti_roughness_function"
}
},
"argument2": {
"type": "minecraft:range_choice",
"input": "tfg:mars/caves/pillars",
"max_exclusive": 0.03,
"min_inclusive": -1000000.0,
"when_in_range": -1000000.0,
"when_out_of_range": "tfg:mars/caves/pillars"
}
}
}
"argument2": "tfg:mars/sloped_cheese"
}
}
}
@ -163,7 +78,8 @@
}
}
},
"argument2": "tfg:mars/caves/noodle"
"argument2": "minecraft:overworld/caves/noodle"
},
"fluid_level_floodedness": {
"type": "minecraft:noise",
@ -437,56 +353,6 @@
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:biome",
"biome_is": [
"tfg:mars/martian_dunes"
]
},
"then_run": {
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 0,
"surface_type": "floor",
"add_surface_depth": false,
"secondary_depth_range": 0
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:blue_concrete"
}
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:biome",
"biome_is": [
"tfg:mars/martian_deep_desert"
]
},
"then_run": {
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 0,
"surface_type": "floor",
"add_surface_depth": false,
"secondary_depth_range": 0
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:purple_concrete"
}
}
}
},
{
"type": "minecraft:condition",
"if_true": {
@ -514,6 +380,152 @@
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:biome",
"biome_is": [
"tfg:mars/martian_dunes",
"tfg:mars/martian_deep_desert"
]
},
"then_run": {
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 2,
"surface_type": "floor",
"add_surface_depth": false,
"secondary_depth_range": 0
},
"then_run": {
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": -2.0,
"max_threshold": -0.4
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "ad_astra:venus_sand"
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": -0.4,
"max_threshold": 0.05
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "ad_astra:mars_sand"
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": 0.05,
"max_threshold": 2.0
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:red_sand"
}
}
}
]
}
]
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 6,
"surface_type": "floor",
"add_surface_depth": false,
"secondary_depth_range": 0
},
"then_run": {
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": -2.0,
"max_threshold": -0.4
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "ad_astra:venus_sandstone"
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": -0.4,
"max_threshold": 0.05
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "ad_astra:mars_stone"
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:mars_dunes_color",
"min_threshold": 0.05,
"max_threshold": 2.0
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:red_sandstone"
}
}
}
]
}
]
}
}
]
}
},
{
"type": "minecraft:condition",
@ -536,7 +548,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -547,7 +559,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -618,7 +630,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -669,7 +681,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -740,7 +752,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -779,7 +791,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -791,7 +803,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -862,7 +874,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -920,7 +932,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -931,7 +943,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1002,7 +1014,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1053,7 +1065,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1124,7 +1136,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1163,7 +1175,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1175,7 +1187,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1246,7 +1258,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1479,7 +1491,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1490,7 +1502,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1561,7 +1573,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1612,7 +1624,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1683,7 +1695,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1722,7 +1734,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_1",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {
@ -1734,7 +1746,7 @@
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": -1.0,
"max_threshold": -0.25
"max_threshold": -0.15
},
"then_run": {
"type": "minecraft:sequence",
@ -1805,7 +1817,7 @@
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "tfg:stone_layer_mars_2",
"min_threshold": 0.25,
"min_threshold": 0.15,
"max_threshold": 1.0
},
"then_run": {

70
kubejs/data/tfg/worldgen/noise_settings/venus_noise.json
View file

@ -268,73 +268,9 @@
"xz_scale": 0.25,
"y_scale": 0.0
},
"vein_gap": {
"type": "minecraft:noise",
"noise": "minecraft:ore_gap",
"xz_scale": 1.0,
"y_scale": 1.0
},
"vein_ridged": {
"type": "minecraft:add",
"argument1": -0.07999999821186066,
"argument2": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 51.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:ore_vein_a",
"xz_scale": 4.0,
"y_scale": 4.0
},
"when_out_of_range": 0.0
}
}
},
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 51.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:ore_vein_b",
"xz_scale": 4.0,
"y_scale": 4.0
},
"when_out_of_range": 0.0
}
}
}
}
},
"vein_toggle": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 51.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:ore_veininess",
"xz_scale": 1.5,
"y_scale": 1.5
},
"when_out_of_range": 0.0
}
}
"vein_gap": 0,
"vein_ridged": 0,
"vein_toggle": 0
},

6
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -696,7 +696,11 @@ function registerGTCEUMetalRecipes(event) {
{ A: chipped, B: '#forge:tools/mortars' })
.id(`shapeless/mortar_chipped_${material.getName()}`)
event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, 9), ChemicalHelper.get(TagPrefix.block, material, 1))
let amount = 9;
if (material == GTMaterials.NetherQuartz || material == GTMaterials.Amethyst)
amount = 4;
event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1))
.recipeTier(0)
.id(`greate:pressing/unpacking_${material.getName()}_block`)
}

4
kubejs/server_scripts/species/recipes.js
View file

@ -6,10 +6,10 @@ function registerSpeciesRecipes(event) {
event.remove({ output: item })
})
event.remove({ mod: 'species' })
event.shapeless('species:music_disc_dial', ['etched:blank_music_disc', 'species:birt_egg'])
event.shapeless('species:music_disc_lapidarian', ['etched:blank_music_disc', 'tfc:rock/raw/basalt_slab'])
event.shapeless('species:music_disk_spawner', ['etched:blank_music_disc', 'computercraft:disk'])
event.shaped('species:cranktrap', [

9
kubejs/server_scripts/tfc/tags.js
View file

@ -517,6 +517,15 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_blue_steel_bucket', 'tfc:spring_water')
event.add('tfc:usable_in_red_steel_bucket', 'tfc:spring_water')
event.add('tfc:alcohols', "tfcagedalcohol:aged_beer")
event.add('tfc:alcohols', "tfcagedalcohol:aged_cider")
event.add('tfc:alcohols', "tfcagedalcohol:aged_rum")
event.add('tfc:alcohols', "tfcagedalcohol:aged_sake")
event.add('tfc:alcohols', "tfcagedalcohol:aged_vodka")
event.add('tfc:alcohols', "tfcagedalcohol:aged_whiskey")
event.add('tfc:alcohols', "tfcagedalcohol:aged_corn_whiskey")
event.add('tfc:alcohols', "tfcagedalcohol:aged_rye_whiskey")
// Добавляем тег для скрытия в EMI
event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth')
event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth_bronze')

2
kubejs/server_scripts/tfg/events.chunks.js
View file

@ -23,7 +23,7 @@ TFCEvents.createChunkDataProvider('mars', event => {
var aquifer = [];
i = 0;
while (i < 16) {
aquifer.push(0);
aquifer.push(32);
i++;
}

43
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -885,4 +885,47 @@ function registerTFGMiscellaneousRecipes(event) {
event.shapeless('9x tfg:aes_insulation_sheet', [
'tfg:aes_insulation_roll'
]).id('tfg:shapeless/aes_insulation_sheet')
global.GTCEU_SUPERCONDUCTORS.forEach((type, index) => {
const multiplier = index + 1
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_small_from_${type.name}`)
.itemInputs(
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4),
)
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
.itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier))
.circuit(4)
.duration(400)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_large_from_${type.name}`)
.itemInputs(
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4),
)
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
.itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier))
.circuit(7)
.duration(600)
.EUt(GTValues.VA[GTValues.MV])
})
event.recipes.gtceu.assembler('tfg:assembler/electromagnetic_accelerator')
.itemInputs(
'2x #forge:plates/desh',
'gtceu:mv_voltage_coil',
'5x tfg:dry_ice',
'gtceu:nonconducting_casing'
)
.inputFluids(Fluid.of('gtceu:blue_alloy', 288))
.itemOutputs('6x tfg:electromagnetic_accelerator')
.circuit(4)
.duration(800)
.EUt(GTValues.VA[GTValues.MV])
}

14
kubejs/server_scripts/tfg/recipes.paper.js
View file

@ -46,8 +46,16 @@ function registerTFGPapermakingRecipes(event) {
.duration(160)
.EUt(7)
//Replace macerate logs into macerate softwood logs
event.replaceInput({ id: 'gtceu:macerator/macerate_logs' }, '#minecraft:logs', '#tfg:softwood')
removeMaceratorRecipe(event, 'macerate_logs')
// Create macerator recipes for softwood
event.recipes.gtceu.macerator('macerate_softwood')
.itemInputs('#tfg:softwood')
.itemOutputs('6x gtceu:wood_dust')
.chancedOutput('gtceu:wood_dust', 8000, 680)
.duration(70)
.EUt(2)
//Create identical macerator recipe for hardwood
event.recipes.gtceu.macerator('macerate_hardwood')
.itemInputs('#tfg:hardwood')
@ -152,4 +160,4 @@ function registerTFGPapermakingRecipes(event) {
.itemOutputs('minecraft:paper')
.duration(40)
.EUt(4)
}
}

7
kubejs/server_scripts/tfg/tags.js
View file

@ -349,6 +349,13 @@ const registerTFGBlockTags = (event) => {
event.add('tfg:harvester_harvestable', '#tfc:berry_bushes')
event.add('tfg:harvester_harvestable', '#tfc:any_spreading_bush')
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_large')
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_small')
event.add('minecraft:mineable/pickaxe', 'tfg:electromagnetic_accelerator')
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_large')
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_small')
event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator')
// #endregion
}
//#endregion

38
kubejs/server_scripts/water_flasks/recipes.js
View file

@ -76,26 +76,28 @@ const registerWaterFlasksRecipes = (event) => {
}).id('tfg:shaped/iron_flask')
event.remove({ id: 'waterflasks:crafting/repair_broken_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:broken_iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_broken_iron')
event.recipes.tfc.no_remainder_shaped_crafting(
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:broken_iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
})).id('tfg:shaped/repair_broken_iron')
event.remove({ id: 'waterflasks:crafting/repair_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_iron')
event.recipes.tfc.no_remainder_shaped_crafting(
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
})).id('tfg:shaped/repair_iron')
event.remove({ id: 'waterflasks:crafting/red_steel_flask' })
event.shaped('waterflasks:red_steel_flask', [

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

@ -299,3 +299,18 @@ global.ADD_CIRCUIT = [
];
//#endregion
//#region Superconductors
/** @global */
global.GTCEU_SUPERCONDUCTORS = [
{name: 'manganese_phosphide', materialId: 'ManganesePhosphide'},
{name: 'magnesium_diboride', materialId: 'MagnesiumDiboride'},
{name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate'},
{name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum'},
{name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide'},
{name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate'},
{name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide'},
{name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide'},
{name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate'}
]
//#endregion

16
kubejs/startup_scripts/gtceu/materials.js
View file

@ -40,7 +40,8 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_PLATE,
GENERATE_DENSE,
GENERATE_RING,
GENERATE_FOIL
GENERATE_FOIL,
GENERATE_FINE_WIRE,
} = $MATERIAL_FLAGS
var metalTooling = [
@ -183,7 +184,18 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
//
// /* Другое */
// /* Superconductors */
GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);
GTMaterials.MagnesiumDiboride.addFlags(GENERATE_FINE_WIRE);
GTMaterials.MercuryBariumCalciumCuprate.addFlags(GENERATE_FINE_WIRE);
GTMaterials.UraniumTriplatinum.addFlags(GENERATE_FINE_WIRE);
GTMaterials.SamariumIronArsenicOxide.addFlags(GENERATE_FINE_WIRE);
//GTMaterials.IndiumTinBariumTitaniumCuprate.addFlags();
//GTMaterials.UraniumRhodiumDinaquadide.addFlags();
//GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.addFlags();
GTMaterials.RutheniumTriniumAmericiumNeutronate.addFlags(GENERATE_FINE_WIRE);
//
// /* Другое (Other) */
// TODO: Exception needs to check the wizardry
GTMaterials.Bismuth.setProperty(PropertyKey.ORE, new $ORE_PROPERTY());

105
pakku-lock.json
View file

@ -4167,7 +4167,7 @@
]
},
{
"pakku_id": "NnX7LmflX7AOHEeC",
"pakku_id": "WR8Eaw7xnPnm4UOD",
"pakku_links": [
"Nw8xTCQngHA15ilh"
],
@ -4186,6 +4186,30 @@
"modrinth": "ATDdrG1y"
},
"files": [
{
"type": "curseforge",
"file_name": "create_hypertube-0.2.3-FORGE.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6785/769/create_hypertube-0.2.3-FORGE.jar",
"id": "6785769",
"parent_id": "1281336",
"hashes": {
"sha1": "15fecf45a7da064af350847c259903af18b6007b",
"md5": "054b2859b02a495ecea2ab5fc6ff6fc1"
},
"required_dependencies": [
"328085"
],
"size": 310156,
"date_published": "2025-07-19T00:55:36.140Z"
},
{
"type": "modrinth",
"file_name": "create_hypertube-0.2.3-FORGE.jar",
@ -4214,30 +4238,6 @@
],
"size": 310156,
"date_published": "2025-07-19T00:59:05.441048Z"
},
{
"type": "curseforge",
"file_name": "create_hypertube-0.2.2-FORGE.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6721/285/create_hypertube-0.2.2-FORGE.jar",
"id": "6721285",
"parent_id": "1281336",
"hashes": {
"sha1": "d162b8a797883b100d1e04f19ce8c0c12e0c1f11",
"md5": "e1776892a5897e2cb5361dfcc76049e6"
},
"required_dependencies": [
"328085"
],
"size": 299727,
"date_published": "2025-07-02T14:17:53.393Z"
}
]
},
@ -13471,9 +13471,10 @@
]
},
{
"pakku_id": "qsKC91BM2qENiBSo",
"pakku_id": "yUBBhskMKRv8l92B",
"pakku_links": [
"rbYKnXWzT4megBI6"
"rbYKnXWzT4megBI6",
"64uacGcEw697jVGs"
],
"type": "MOD",
"side": "BOTH",
@ -13490,6 +13491,31 @@
"modrinth": "lNttW2Xl"
},
"files": [
{
"type": "curseforge",
"file_name": "TerraFirmaGreg-Core-Modern-0.7.3.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6788/331/TerraFirmaGreg-Core-Modern-0.7.3.jar",
"id": "6788331",
"parent_id": "513402",
"hashes": {
"sha1": "a3c5f0ff25afdc7826ca3931493d705b0a5f2665",
"md5": "59e7caa63813f1eca2264c40aa457c67"
},
"required_dependencies": [
"890405",
"302973"
],
"size": 451137,
"date_published": "2025-07-19T17:18:03.270Z"
},
{
"type": "modrinth",
"file_name": "TerraFirmaGreg-Core-Modern-0.7.3.jar",
@ -13514,31 +13540,6 @@
],
"size": 451137,
"date_published": "2025-07-19T17:18:04.503966Z"
},
{
"type": "curseforge",
"file_name": "TerraFirmaGreg-Core-Modern-0.7.2.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6763/731/TerraFirmaGreg-Core-Modern-0.7.2.jar",
"id": "6763731",
"parent_id": "513402",
"hashes": {
"sha1": "a8e280cf82fc0f189f23a3fd64da696d9922b6b5",
"md5": "0aa8b4d8f19866f341090664dab8496c"
},
"required_dependencies": [
"890405",
"302973"
],
"size": 436018,
"date_published": "2025-07-13T12:04:21.110Z"
}
]
},