Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add arsenic bronze tools for illagers

Browse Source
This commit is contained in:
Pyritie
2026-03-07 16:29:37 +00:00
parent bfc78c38fa
commit c1ec0e6b9c
4 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kubejs/server_scripts/primitive_creatures/loot.js
View File

@@ -35,7 +35,7 @@ function registerPrimitiveCreaturesLoots(event) {
Item.of('tfc:food/strawberry', 4),
Item.of('tfc:food/wintergreen_berry', 5)])
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_hoe').damage([0.2, 0.5]).when(c => c.randomChance(0.1)),
LootEntry.of('gtceu:arsenic_bronze_hoe').damage([0.2, 0.5]).when(c => c.randomChance(0.1)),
LootEntry.of('sns:straw_basket').when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)),
@@ -54,7 +54,7 @@ function registerPrimitiveCreaturesLoots(event) {
.addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet'])
.addWeightedLoot([3, 4], ['gtceu:tricalcium_phosphate_dust'])
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('gtceu:arsenic_bronze_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)),
LootEntry.of('firmalife:beeswax'))
@@ -73,7 +73,7 @@ function registerPrimitiveCreaturesLoots(event) {
.addWeightedLoot([0, 2], ['minecraft:flint'])
.addWeightedLoot([1, 3], ['minecraft:bone'])
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.2, 0.5]).when(c => c.randomChance(0.5)),
LootEntry.of('gtceu:arsenic_bronze_shovel').damage([0.2, 0.5]).when(c => c.randomChance(0.5)),
LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:grh')) // battered wool
event.addEntityLootModifier('primitive_creatures:iloger_3')
@@ -129,7 +129,7 @@ function registerPrimitiveCreaturesLoots(event) {
.addWeightedLoot([1, 2], ['primitive_creatures:f_1']) // primitive explosives
.addWeightedLoot([2, 4], ['minecraft:gunpowder'])
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('gtceu:arsenic_bronze_hoe').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:grh')) // battered wool
@@ -147,7 +147,7 @@ function registerPrimitiveCreaturesLoots(event) {
.addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet'])
.addWeightedLoot([0, 2], ['primitive_creatures:grh']) // battered wool
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('gtceu:arsenic_bronze_butchery_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)),
LootEntry.of('minecraft:lead'))
@@ -181,7 +181,7 @@ function registerPrimitiveCreaturesLoots(event) {
.addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet'])
.addWeightedLoot([2, 4], ['minecraft:emerald'])
.addAlternativesLoot(
LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('gtceu:arsenic_bronze_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)),
LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)),
LootEntry.of('primitive_creatures:grh')) // battered wool)
@@ -198,10 +198,10 @@ function registerPrimitiveCreaturesLoots(event) {
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet'])
.addWeightedLoot([
Item.of('gtceu:cobalt_brass_spade', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'),
Item.of('gtceu:cobalt_brass_scythe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:2,AoELayer:2,AoERow:2,MaxAoEColumn:2,MaxAoELayer:2,MaxAoERow:2},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.2f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:6.5f},HideFlags:2}'),
Item.of('gtceu:cobalt_brass_mining_hammer', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1,TorchPlacing:1b},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'),
Item.of('gtceu:cobalt_brass_sword')])
Item.of('gtceu:arsenic_bronze_spade', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'),
Item.of('gtceu:arsenic_bronze_scythe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:2,AoELayer:2,AoERow:2,MaxAoEColumn:2,MaxAoELayer:2,MaxAoERow:2},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.2f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:6.5f},HideFlags:2}'),
Item.of('gtceu:arsenic_bronze_mining_hammer', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{AoEColumn:1,AoELayer:0,AoERow:1,MaxAoEColumn:1,MaxAoELayer:0,MaxAoERow:1,TorchPlacing:1b},GT.Tool:{AttackDamage:3.5f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:18431,ToolSpeed:5.0f},HideFlags:2}'),
Item.of('gtceu:arsenic_bronze_sword')])
event.addEntityLootModifier('primitive_creatures:nahida')
.addWeightedLoot([
Item.of('sns:leather_sack'),
@@ -224,8 +224,8 @@ function registerPrimitiveCreaturesLoots(event) {
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet'])
.addWeightedLoot([
Item.of('gtceu:cobalt_brass_sword'),
Item.of('gtceu:cobalt_brass_axe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{DisableShields:1b,TreeFelling:1b},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:6143,ToolSpeed:4.5f},HideFlags:2}'),
Item.of('gtceu:arsenic_bronze_sword'),
Item.of('gtceu:arsenic_bronze_axe', '{Damage:0,DisallowContainerItem:0b,GT.Behaviours:{DisableShields:1b,TreeFelling:1b},GT.Tool:{AttackDamage:7.0f,AttackSpeed:-3.4f,DefaultEnchantments:[],HarvestLevel:2,MaxDamage:6143,ToolSpeed:4.5f},HideFlags:2}'),
LootEntry.of('sns:burlap_sack'),
LootEntry.of('sns:seed_pouch'),
LootEntry.of('sns:ore_sack')])

12
kubejs/startup_scripts/tfg/materials/material_modification.tools.js
View File

@@ -220,6 +220,18 @@ function registerTFGToolMaterialModification(event) {
GTToolType.PICKAXE,
GTToolType.SWORD
]).build());
TFGHelpers.getMaterial('arsenic_bronze').setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(5.5, 4, 212, 2, [
GTToolType.HOE,
GTToolType.KNIFE,
GTToolType.SHOVEL,
GTToolType.BUTCHERY_KNIFE,
GTToolType.SPADE,
GTToolType.SCYTHE,
GTToolType.MINING_HAMMER,
GTToolType.SWORD,
GTToolType.AXE
]).build());
// ULV

6
kubejs/startup_scripts/tfg/materials/materials.misc_alloys.js
View File

@@ -7,6 +7,12 @@
function registerTFGMiscAlloyMaterials(event) {
const $BlastProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty")
// Material used for Illager tools only
event.create('tfg:arsenic_bronze')
.components('1x arsenic', '1x tin', '8x copper')
.color(0xE76848)
.iconSet('metallic')
// EV New Material
event.create('tfg:tungsten_bismuth_oxide_composite')

19
kubejs/startup_scripts/tfg/tag_prefixes.js
View File

@@ -97,6 +97,25 @@ function registerTFGTagPrefixes(event) {
TagPrefix.dustTiny.setIgnored(GTMaterials.get('tfg:diamond_tipped_mo_50_re'))
TagPrefix.bolt.setIgnored(GTMaterials.get('tfg:diamond_tipped_mo_50_re'))
TagPrefix.screw.setIgnored(GTMaterials.get('tfg:diamond_tipped_mo_50_re'))
TagPrefix.block.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TagPrefix.ingot.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TagPrefix.nugget.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TagPrefix.dust.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TagPrefix.dustSmall.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TagPrefix.dustTiny.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadSword.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadButcheryKnife.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadMiningHammer.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadSpade.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadPickaxe.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadAxe.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadShovel.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadHoe.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadHammer.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadSaw.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadScythe.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
TFGTagPrefix.toolHeadKnife.setIgnored(GTMaterials.get('tfg:arsenic_bronze'))
}
function excludeAllGemsButNormal(material) {