diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index f8e3162e0..17a3d7fa1 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -6,13 +6,21 @@ const registerGTCEULoots = (event) => { GTRegistries.MATERIALS.forEach(material => { if (material.hasProperty(PropertyKey.ORE)) { + let stoneTypeMaterial = GTMaterials.get(stoneType) + let stoneTypeDust = null + + if (!stoneTypeMaterial != null) stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1) + let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1) let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1) let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1).withChance(0.2) + let blockName = `gtceu:${stoneType}_${material}_ore` + if (!richRawOre.isEmpty() && !normalRawOre.isEmpty() && !poorRawOre.isEmpty()) { - event.addBlockLootModifier(`gtceu:${stoneType}_${material}_ore`) + event.addBlockLootModifier(blockName) + .matchMainHand('#minecraft:pickaxes') .removeLoot(Ingredient.all) .addWeightedLoot([ richRawOre.withChance(0.2), @@ -20,7 +28,14 @@ const registerGTCEULoots = (event) => { poorRawOre.withChance(0.2) ]); } - + + if (!stoneTypeDust.isEmpty()) { + event.addBlockLootModifier(blockName) + .matchMainHand('#minecraft:pickaxes') + .addLoot( + LootEntry.of(stoneTypeDust).when((c) => c.randomChance(0.25)) + ) + } } }) }) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index bb0f7e688..7b0b8f93e 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -55,6 +55,10 @@ const registerTFCRecipes = (event) => { .resultFluid(Fluid.of(outputMaterial.getFluid(), 288)) .id(`tfc:heating/metal/${material}_double_ingot`) + // 2 слитка -> Двойной слиток + event.recipes.tfc.welding(doubleIngotItem, ingotItem, ingotItem, tfcProperty.getTier()) + .id(`tfc:welding/${material}_double_ingot`) + // Plates let plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) if (!plateItem.isEmpty()) {