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

Disable energy p2p (#1661)

Browse source 
* github being github

* First bandage fix for removing FE P2P
This commit is contained in:
TomPlop 2025-08-21 04:42:07 -04:00 • committed by GitHub
parent 6134da9caf
commit 4d801d9c96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 293 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/ae2/common.json
View file

@ -76,7 +76,7 @@
"CrystalResonanceGeneratorRate_comment": "How much energy a crystal resonance generator generates per tick.",
"CrystalResonanceGeneratorRate": 20.0,
"p2pTunnelEnergyTax_comment": "The cost to transport energy through an energy P2P tunnel expressed as a factor of the transported energy.",
"p2pTunnelEnergyTax": 0.025,
"p2pTunnelEnergyTax": 0.999,
"p2pTunnelTransportTax_comment": "The cost to transport items/fluids/etc. through P2P tunnels, expressed in AE energy per equivalent I/O bus operation for the transported object type (i.e. items\u003dper 1 item, fluids\u003dper 125mb).",
"p2pTunnelTransportTax": 0.025
},

278
kubejs/assets/tfg/blockstates/large_nest_box.json
View file

@ -1,140 +1,140 @@
{
"variants": {
"facing=north,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=north,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=north,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=north,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=south,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=south,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=east,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=east,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=east,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=east,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=west,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=west,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0"
},
"facing=north,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 270
},
"facing=north,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 270
},
"facing=south,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 90
},
"facing=south,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3"
},
"facing=east,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 90
},
"facing=east,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 180
},
"facing=east,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2"
},
"facing=east,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1"
},
"facing=west,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 180
},
"facing=west,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 90
}
}
{
"variants": {
"facing=north,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=north,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=north,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=north,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=south,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=south,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=east,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=east,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=east,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=east,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_empty"
},
"facing=west,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 180
},
"facing=west,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_empty",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0"
},
"facing=north,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 270
},
"facing=north,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 270
},
"facing=south,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 90
},
"facing=south,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3"
},
"facing=east,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 90
},
"facing=east,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1",
"y": 180
},
"facing=east,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2"
},
"facing=east,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_0",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_1"
},
"facing=west,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_2",
"y": 180
},
"facing=west,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_sniffer_3",
"y": 90
}
}
}

278
kubejs/assets/tfg/blockstates/large_nest_box_warped.json
View file

@ -1,140 +1,140 @@
{
"variants": {
"facing=north,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=north,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=north,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=north,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=south,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=south,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=east,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=east,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=east,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=east,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=west,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=west,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0"
},
"facing=north,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 270
},
"facing=north,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 270
},
"facing=south,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 90
},
"facing=south,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3"
},
"facing=east,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 90
},
"facing=east,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 180
},
"facing=east,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2"
},
"facing=east,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1"
},
"facing=west,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 180
},
"facing=west,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 90
}
}
{
"variants": {
"facing=north,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=north,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=north,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=north,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=south,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=south,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=south,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=east,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=east,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=east,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=east,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 270
},
"facing=west,has_egg_type=0,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty"
},
"facing=west,has_egg_type=0,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 180
},
"facing=west,has_egg_type=0,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_empty",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0"
},
"facing=north,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 90
},
"facing=north,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 270
},
"facing=north,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 180
},
"facing=south,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 270
},
"facing=south,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 90
},
"facing=south,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3"
},
"facing=east,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 90
},
"facing=east,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1",
"y": 180
},
"facing=east,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2"
},
"facing=east,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=0": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0",
"y": 270
},
"facing=west,has_egg_type=1,nest_part=1": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1"
},
"facing=west,has_egg_type=1,nest_part=2": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2",
"y": 180
},
"facing=west,has_egg_type=1,nest_part=3": {
"model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3",
"y": 90
}
}
}

10
kubejs/assets/tfg/models/item/sniffer_egg.json
View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "minecraft:item/sniffer_egg"
}
{
"parent": "item/generated",
"textures": {
"layer0": "minecraft:item/sniffer_egg"
}
}

8
kubejs/data/railways/loot_tables/entities/conductor.json
View file

@ -1,5 +1,5 @@
{
"type": "minecraft:entity",
"pools": [],
"random_sequence": "railways:entities/conductor"
{
"type": "minecraft:entity",
"pools": [],
"random_sequence": "railways:entities/conductor"
}

2
kubejs/server_scripts/ae2/recipes.js
View file

@ -17,6 +17,8 @@ const registerAE2Recipes = (event) => {
], mod: 'ae2'
});
event.remove( { output: 'ae2:fe_p2p_tunnel' } )
// Cutting knives (for renaming things)
event.shaped('ae2:certus_quartz_cutting_knife', [
' A',

2
kubejs/server_scripts/ae2/tags.js
View file

@ -10,6 +10,8 @@ const registerAE2ItemTags = (event) => {
event.remove('forge:storage_blocks', 'ae2:quartz_block')
event.remove('forge:storage_blocks/certus_quartz', 'ae2:quartz_block')
event.removeAll('ae2:p2p_attunements/fe_p2p_tunnel')
event.add('tfg:certus_quartz_blocks', 'gtceu:certus_quartz_block')
event.add('tfg:certus_quartz_blocks', 'ae2:quartz_block')

1
kubejs/startup_scripts/ae2/constants.js
View file

@ -25,6 +25,7 @@ global.AE2_DISABLED_ITEMS = [
'ae2:charged_staff',
'ae2:name_press',
'ae2:charger',
'ae2:fe_p2p_tunnel',
// Блоки
'ae2:vibration_chamber',