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

Bugfix/glass item drop compat (#1369)

Browse source 
* glass breaking drops

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
This commit is contained in:
GameStar 2025-07-17 19:33:58 -05:00 • committed by GitHub
parent e84254ee4e
commit d1dd3c9e35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 66 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -9,6 +9,7 @@
- Increased maximum range of rope/elevator pulleys to 400 blocks (#1347) @Pyritie
- Added Tier 2 Insulation: Alkaline Earth Silicate @BlueBoat29
- Added tfc data to tacz guns and attachments (#1353) @Redeix
- Allowed "window" blocks and panes to be broken and picked up @BlueBoat29
### Bug fixes
- Fixed yeast food processor conflict (#1310) @Redeix
- Fixed seed oil voiding in barrels (#1310) @Redeix
@ -39,6 +40,7 @@
- Fixed Ad Astra space suit quest mentioning oxygen instead of breathable gas (#1353) @Redeix
- Fixed flintlock not being craftable before LV (#1353) @Redeix
- Fixed the field guide not working for chinese players (#1356) @Pyritie
- Fixed glass blocks dropping with gem saw (#1367) @BlueBoat29
## [0.10.0] - 13.07.2025
- [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!

65
kubejs/server_scripts/tfg/loot_tables.js
View file

@ -88,4 +88,67 @@ function registerTFGLoots(event) {
.addLoot('minecraft:campfire')
//#endregion
};
//Cross-mod glass compat
const STRONG_GLASSES = [
['create:dark_oak_window', true],
['create:mangrove_window', true],
['create:ornate_iron_window', true],
['create:industrial_iron_window', true],
['create:weathered_iron_window', true],
['create:cherry_window', true],
['create:bamboo_window', true],
['createdeco:andesite_window', true],
['createdeco:copper_window', true],
['createdeco:iron_window', true],
['createdeco:industrial_iron_window', true],
['createdeco:brass_window', true],
['createdeco:zinc_window', true],
['everycomp:c/domum_ornamentum/cactus_window_pane', false],
['everycomp:c/domum_ornamentum/cactus_extra_window_pane', false]
]
const GLASSES = [
'create:framed_glass',
'create:vertical_framed_glass',
'create:horizontal_framed_glass',
'create:tiled_glass'
]
STRONG_GLASSES.forEach(glass => {
event.addBlockLootModifier(glass[0])
.addLoot(glass[0])
if(glass[1]){
event.addBlockLootModifier(glass[0] + "_pane")
.addLoot(glass[0] + "_pane")
}
});
GLASSES.forEach(glass => {
event.addBlockLootModifier(glass)
.matchMainHand(Item.of('tfc:gem_saw'))
.addLoot(glass)
event.addBlockLootModifier(glass + "_pane")
.matchMainHand(Item.of('tfc:gem_saw'))
.addLoot(glass + "_pane")
})
global.TFC_WOOD_TYPES.forEach(wood => {
const id = 'everycomp:c/tfc/' + wood + "_window_pane"
event.addBlockLootModifier(id)
.addLoot(id)
})
global.AFC_WOOD_TYPES.forEach(wood => {
const id = 'everycomp:c/afc/' + wood + "_window_pane"
event.addBlockLootModifier(id)
.addLoot(id)
})
global.AD_ASTRA_WOOD.forEach(wood => {
const id = 'everycomp:c/ad_astra/' + wood.name + "_window_pane"
event.addBlockLootModifier(id)
.addLoot(id)
})
};