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

fix bud indicator loot tables and crafting recipe #2499

Browse source
This commit is contained in:
Pyritie 2025-12-23 17:52:12 +00:00
parent 9a08b55355
commit 34edeccdf6
4 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@
- Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714 - Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714
- Fixed a potential crash involving the refrigerator @Redeix - Fixed a potential crash involving the refrigerator @Redeix
- Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714 - Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714
- Fixed loot tables for ore indicator buds @Pyritie
### Translation updates ### Translation updates
- Chinese (simplified) @jmecn - Chinese (simplified) @jmecn
- Ukranian @MetEnBouldry - Ukranian @MetEnBouldry

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

@ -792,7 +792,7 @@ function registerGTCEUMetalRecipes(event) {
let smallDust = ChemicalHelper.get(TagPrefix.dustSmall, material, 1) let smallDust = ChemicalHelper.get(TagPrefix.dustSmall, material, 1)
event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless( event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless(
ChemicalHelper.get(TagPrefix.surfaceRock, material, 1), [gem, '#tfc:chisels'])) ChemicalHelper.get(TFGTagPrefix.budIndicator, material, 1), [gem, '#tfc:chisels']))
.id(`shapeless/${material.getName()}_bud_indicator`) .id(`shapeless/${material.getName()}_bud_indicator`)
event.shaped(smallDust, event.shaped(smallDust,

31
kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js
View file

@ -23,15 +23,15 @@ const STONE_TYPES_TO_COBBLE = {
granite: 'tfc:rock/cobble/granite', granite: 'tfc:rock/cobble/granite',
deepslate: 'minecraft:cobbled_deepslate', deepslate: 'minecraft:cobbled_deepslate',
pyroxenite: 'tfg:rock/cobble_blackstone', pyroxenite: 'tfg:rock/cobble_blackstone',
dripstone: 'tfg:block/rock/cobble_dripstone', dripstone: 'tfg:rock/cobble_dripstone',
keratophyre: 'tfg:block/rock/cobble_crackrack', keratophyre: 'tfg:rock/cobble_crackrack',
moon_stone: 'ad_astra:moon_cobblestone', moon_stone: 'ad_astra:moon_cobblestone',
moon_deepslate: 'ad_astra:moon_sand', moon_deepslate: 'tfg:rock/cobble_moon_deepslate',
mars_stone: 'ad_astra:mars_cobblestone', mars_stone: 'ad_astra:mars_cobblestone',
venus_stone: 'ad_astra:venus_cobblestone', venus_stone: 'ad_astra:venus_cobblestone',
mercury_stone: 'ad_astra:mercury_cobblestone', mercury_stone: 'ad_astra:mercury_cobblestone',
glacio_stone: 'ad_astra:glacio_cobblestone', glacio_stone: 'ad_astra:glacio_cobblestone',
permafrost: 'gtceu:ice_dust' permafrost: 'tfg:rock/cobble_permafrost'
} }
const registerTFGOreLoots = (event) => { const registerTFGOreLoots = (event) => {
@ -69,37 +69,22 @@ const registerTFGOreLoots = (event) => {
// Indicator buds // Indicator buds
if (material.hasProperty(PropertyKey.GEM)) { if (material.hasProperty(PropertyKey.GEM)) {
let normalDrop = ChemicalHelper.get(TagPrefix.gemChipped, material, 1) let bud = ChemicalHelper.get(TFGTagPrefix.budIndicator, material, 1).getItem().id;
let sawDrop = ChemicalHelper.get(TagPrefix.gem, material, 1)
let bud = ChemicalHelper.get(TagPrefix.surfaceRock, material, 1)
event.addBlockLootModifier(bud) event.addBlockLootModifier(bud)
.matchMainHand("tfc:gem_saw") .matchMainHand("tfc:gem_saw")
.addLoot(sawDrop); .addLoot(ChemicalHelper.get(TagPrefix.gem, material, 1));
event.addBlockLootModifier(bud) event.addBlockLootModifier(bud)
.not(n => n.matchMainHand("tfc:gem_saw")) .not(n => n.matchMainHand("tfc:gem_saw"))
.addLoot(normalDrop); .addLoot(ChemicalHelper.get(TagPrefix.gemChipped, material, 1));
} }
let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1) let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1)
let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1) let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1)
let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1) let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1)
// I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS let rawOreBlock = ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem().id;
let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`;
if (material === GTMaterials.Copper || material === GTMaterials.Gold || material === GTMaterials.Iron) {
rawOreBlock = `minecraft${rawOreBlock}`;
} else if (material === TFGHelpers.getMaterial('desh')
|| material === TFGHelpers.getMaterial('ostrum')
|| material === TFGHelpers.getMaterial('calorite')) {
rawOreBlock = `ad_astra${rawOreBlock}`;
} else if (material === $GreateMaterials.RoseQuartz) {
rawOreBlock = `greate${rawOreBlock}`;
} else {
rawOreBlock = `gtceu${rawOreBlock}`;
}
event.addBlockLootModifier(rawOreBlock) event.addBlockLootModifier(rawOreBlock)
.removeLoot(ItemFilter.ALWAYS_TRUE) .removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([4, 6], .addWeightedLoot([4, 6],

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

@ -246,8 +246,7 @@ global.GTCEU_HIDED_ITEMS = /** @type {const} */ ([
"gtceu:iv_damascus_steel_wrench", "gtceu:iv_damascus_steel_wrench",
"gtceu:lv_damascus_steel_screwdriver", "gtceu:lv_damascus_steel_screwdriver",
"gtceu:sus_record", "gtceu:sus_record"
"expatternprovider:fishbig"
]); ]);
//#endregion //#endregion