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

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-12-20 18:03:12 +00:00
commit e55399b9c1
17 changed files with 150 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json
View file

@ -217,7 +217,7 @@
},
{
"function": "minecraft:set_nbt",
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1},}"
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}}"
}
],
"weight": 100

2
kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json
View file

@ -217,7 +217,7 @@
},
{
"function": "minecraft:set_nbt",
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\": 1}"
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\": 1}}"
}
],
"weight": 100

2
kubejs/data/minecraft/loot_tables/chests/bastion_other.json
View file

@ -217,7 +217,7 @@
},
{
"function": "minecraft:set_nbt",
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}"
"tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}}"
}
],
"weight": 100

3
kubejs/data/tfg/worldgen/biome/nether/ash_forest.json
View file

@ -50,7 +50,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"minecraft:spring_delta",

3
kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json
View file

@ -52,7 +52,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"minecraft:spring_delta",

3
kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json
View file

@ -51,7 +51,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json
View file

@ -47,7 +47,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json
View file

@ -47,7 +47,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json
View file

@ -48,7 +48,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/granite_caves.json
View file

@ -48,7 +48,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/lava_floes.json
View file

@ -51,7 +51,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"minecraft:spring_delta",

4
kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json
View file

@ -46,7 +46,9 @@
[],
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[],
[
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",
"tfg:nether/surface/loose_deepslate",

3
kubejs/data/tfg/worldgen/biome/nether/schist_caves.json
View file

@ -47,7 +47,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

3
kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json
View file

@ -40,7 +40,8 @@
"#tfg:nether_veins",
"#tfg:nether_underground_decoration",
[
"tfg:nether/terrain/spring_lava"
"tfg:nether/terrain/spring_lava",
"tfg:nether/terrain/mossy_cobble"
],
[
"beneath:blackstone_boulders",

99
kubejs/data/tfg/worldgen/configured_feature/nether/terrain/mossy_cobble.json Normal file
View file

@ -0,0 +1,99 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0,
"size": 20,
"targets": [
{
"state": {
"Name": "tfg:rock/mossy_cobble_deepslate"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:deepslate"
}
},
{
"state": {
"Name": "tfg:rock/mossy_cobble_blackstone"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:blackstone"
}
},
{
"state": {
"Name": "tfg:rock/mossy_cobble_dripstone"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:dripstone_block"
}
},
{
"state": {
"Name": "tfg:rock/mossy_cobble_crackrack"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "beneath:crackrack"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/diorite"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/diorite"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/gabbro"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/gabbro"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/gneiss"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/gneiss"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/granite"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/granite"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/schist"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/schist"
}
},
{
"state": {
"Name": "tfc:rock/mossy_cobble/basalt"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/basalt"
}
}
]
}
}

24
kubejs/data/tfg/worldgen/placed_feature/nether/terrain/mossy_cobble.json Normal file
View file

@ -0,0 +1,24 @@
{
"feature": "tfg:nether/terrain/mossy_cobble",
"placement": [
{
"type": "minecraft:count",
"count": 20
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:trapezoid",
"max_inclusive": {
"absolute": 120
},
"min_inclusive": {
"absolute": 32
}
}
}
]
}

2
kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js
View file

@ -22,7 +22,7 @@ function registerTFGCollapseRecipes(event) {
event.recipes.tfc.landslide('tfg:ash_pile', 'tfg:ash_pile')
event.recipes.tfc.landslide('minecraft:cobbled_deepslate', 'minecraft:cobbled_deepslate')
event.recipes.tfc.landslide('minecraft:mossy_cobbled_deepslate', 'minecraft:mossy_cobbled_deepslate')
event.recipes.tfc.landslide('tfg:rock/mossy_cobble_deepslate', 'tfg:rock/mossy_cobble_deepslate')
event.recipes.tfc.landslide('tfg:rock/cobble_blackstone', 'tfg:rock/cobble_blackstone')
event.recipes.tfc.landslide('tfg:rock/mossy_cobble_blackstone', 'tfg:rock/mossy_cobble_blackstone')
event.recipes.tfc.landslide('tfg:rock/cobble_dripstone', 'tfg:rock/cobble_dripstone')