From ffa31fc4f29d1ed91e539fd1dd46e6a1586bbc34 Mon Sep 17 00:00:00 2001 From: 0526ngs <78349683+hrmcngs@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:44:30 +0900 Subject: [PATCH] version up --- ...ruwoShoudeChituteiruJiannoteituku.mod.json | 2 +- ...NannkasouNightVisionEffectExpires.mod.json | 2 +- ...ouNightVisionEffectStartedapplied.mod.json | 2 +- ...asouNightVisionOnEffectActiveTick.mod.json | 2 +- elements/SkinOfDragonTick.mod.json | 2 +- elements/SwordStandLuna.mod.json | 2 +- minecraft_armor_weapon.mcreator | 32 +++++++++---------- .../potion/NannkasouNightVisionMobEffect.java | 4 +-- ...houdeChituteiruJiannoteitukuProcedure.java | 2 -- ...asouNightVisionEffectExpiresProcedure.java | 15 +++------ ...htVisionEffectStartedappliedProcedure.java | 12 ++++++- ...ightVisionOnEffectActiveTickProcedure.java | 2 +- .../procedures/SkinOfDragonTickProcedure.java | 9 ++++-- .../minecraft_armor_weapon/lang/en_us.json | 12 +++---- .../minecraft_armor_weapon/lang/ja_jp.json | 12 +++---- .../functions/sword_stand_luna.mcfunction | 1 + 16 files changed, 59 insertions(+), 54 deletions(-) diff --git a/elements/IronKatanaturuwoShoudeChituteiruJiannoteituku.mod.json b/elements/IronKatanaturuwoShoudeChituteiruJiannoteituku.mod.json index 807c7c88..a03c5fcd 100644 --- a/elements/IronKatanaturuwoShoudeChituteiruJiannoteituku.mod.json +++ b/elements/IronKatanaturuwoShoudeChituteiruJiannoteituku.mod.json @@ -2,6 +2,6 @@ "_fv": 43, "_type": "procedure", "definition": { - "procedurexml": "arbno_ext_triggerCUSTOM:LokiTheTricksterCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:WitherKatanaCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:ReplicaSwordOfLightCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:ScytheCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:DarknessKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:GoldKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:NinjatouCUSTOM:LongRangeWeaponCut12TRUEFALSEEQglobal:aaa6CUSTOM:Test12TRUEFALSEglobal:ddd斬ってるんとちゃうぞCUSTOM:KatanaNiguHumerusCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:SmallSwordCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:PrototypeKatanaCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:RiversOfBloodEQglobal:aaa4global:ddd§4§kdevour bloodEQglobal:aaa4global:ddd突きCUSTOM:RiversOfBloodEQglobal:aaa4global:ddd§4§kdevour bloodCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:SwordOfNightEQglobal:aaa2global:ddd§dぽんパチパチEQglobal:aaa3global:ddd§1てゅーんとんEQglobal:aaa4global:ddd薙ぎ払いEQglobal:aaa3EntityLiving5050EQgyamigyapitonndeyaru1playsound minecraft:block.beacon.activate neutral @a ~ ~ ~ 2 2playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 2 1CUSTOM:KurutimenasiCUSTOM:SwordOfNight40CUSTOM:SwordOfNightEffect120TRUEFALSEgyamigyapitonndeyaru0local:r120EntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5EntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5GLOWING12TRUEFALSEEntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5BREAKlocal:rADDlocal:r1CUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:Halloween20231031SickleCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MagischesFeenKatanaparticle minecraft:enchant ~ ~1 ~ 0.5 0.5 0.5 0.1 1 normal @sCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MagicalKatanaparticle minecraft:enchant ~ ~1 ~ 0.5 0.5 0.5 0.1 1 normal @sCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:WarabitetouCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSEORORCUSTOM:KurikarakenCUSTOM:KurikarakenswordCUSTOM:KurikarakenutigatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:LunaCUSTOM:NannkasouNightVision2551TRUEFALSECUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MyTestIronKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:IronKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSE" + "procedurexml": "arbno_ext_triggerCUSTOM:LokiTheTricksterCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:WitherKatanaCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:ReplicaSwordOfLightCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:ScytheCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:DarknessKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:GoldKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:NinjatouCUSTOM:LongRangeWeaponCut12TRUEFALSEEQglobal:aaa6CUSTOM:Test12TRUEFALSEglobal:ddd斬ってるんとちゃうぞCUSTOM:KatanaNiguHumerusCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:SmallSwordCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:PrototypeKatanaCUSTOM:LongRangeWeaponCut12TRUEFALSECUSTOM:RiversOfBloodEQglobal:aaa4global:ddd§4§kdevour bloodEQglobal:aaa4global:ddd突きCUSTOM:RiversOfBloodEQglobal:aaa4global:ddd§4§kdevour bloodCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:SwordOfNightEQglobal:aaa2global:ddd§dぽんパチパチEQglobal:aaa3global:ddd§1てゅーんとんEQglobal:aaa4global:ddd薙ぎ払いEQglobal:aaa3EntityLiving5050EQgyamigyapitonndeyaru1playsound minecraft:block.beacon.activate neutral @a ~ ~ ~ 2 2playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 2 1CUSTOM:KurutimenasiCUSTOM:SwordOfNight40CUSTOM:SwordOfNightEffect120TRUEFALSEgyamigyapitonndeyaru0local:r120EntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5EntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5GLOWING12EntityLivingADDMULTIPLYlocal:rADDADD1.5MULTIPLYlocal:rADDMULTIPLYlocal:r0.5TRUEFALSEBREAKlocal:rADDlocal:r1CUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:Halloween20231031SickleCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MagischesFeenKatanaparticle minecraft:enchant ~ ~1 ~ 0.5 0.5 0.5 0.1 1 normal @sCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MagicalKatanaparticle minecraft:enchant ~ ~1 ~ 0.5 0.5 0.5 0.1 1 normal @sCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:WarabitetouCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSEORORCUSTOM:KurikarakenCUSTOM:KurikarakenswordCUSTOM:KurikarakenutigatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:LunaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:MyTestIronKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSECUSTOM:IronKatanaCUSTOM:DemonizedCUSTOM:Arrow112TRUEFALSE" } } \ No newline at end of file diff --git a/elements/NannkasouNightVisionEffectExpires.mod.json b/elements/NannkasouNightVisionEffectExpires.mod.json index de1ce05d..4c8a3c52 100644 --- a/elements/NannkasouNightVisionEffectExpires.mod.json +++ b/elements/NannkasouNightVisionEffectExpires.mod.json @@ -2,6 +2,6 @@ "_fv": 43, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerNIGHT_VISION2NIGHT_VISIONminecraft_armor_weapon_sword_night_vision_lavelminecraft_armor_weapon_sword_night_vision_tickFALSEFALSE" + "procedurexml": "2no_ext_triggerNIGHT_VISIONminecraft_armor_weapon_sword_night_vision_tickminecraft_armor_weapon_sword_night_vision_lavelCUSTOM:NannkasouNightVision2551TRUEFALSE" } } \ No newline at end of file diff --git a/elements/NannkasouNightVisionEffectStartedapplied.mod.json b/elements/NannkasouNightVisionEffectStartedapplied.mod.json index 8197fc76..e7118386 100644 --- a/elements/NannkasouNightVisionEffectStartedapplied.mod.json +++ b/elements/NannkasouNightVisionEffectStartedapplied.mod.json @@ -2,6 +2,6 @@ "_fv": 43, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerNIGHT_VISIONminecraft_armor_weapon_sword_night_vision_tickNIGHT_VISIONminecraft_armor_weapon_sword_night_vision_lavelNIGHT_VISION0" + "procedurexml": "no_ext_triggerNIGHT_VISIONminecraft_armor_weapon_sword_night_vision_tickNIGHT_VISIONminecraft_armor_weapon_sword_night_vision_lavelNIGHT_VISIONCUSTOM:NannkasouNightVisionNIGHT_VISION160FALSEFALSE0" } } \ No newline at end of file diff --git a/elements/NannkasouNightVisionOnEffectActiveTick.mod.json b/elements/NannkasouNightVisionOnEffectActiveTick.mod.json index 3f8488bb..2b1c7cd7 100644 --- a/elements/NannkasouNightVisionOnEffectActiveTick.mod.json +++ b/elements/NannkasouNightVisionOnEffectActiveTick.mod.json @@ -2,6 +2,6 @@ "_fv": 43, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerNIGHT_VISION255200FALSETRUE" + "procedurexml": "no_ext_triggerNIGHT_VISION255250TRUEFALSE" } } \ No newline at end of file diff --git a/elements/SkinOfDragonTick.mod.json b/elements/SkinOfDragonTick.mod.json index 3bc0633a..f74f254b 100644 --- a/elements/SkinOfDragonTick.mod.json +++ b/elements/SkinOfDragonTick.mod.json @@ -2,6 +2,6 @@ "_fv": 43, "_type": "procedure", "definition": { - "procedurexml": "EQTRUECUSTOM:TestBowtagNameplayer_ticksEntityPlayerteam join minecraft_armor_weapon_dark_purple @e[type=item,limit=1,sort=nearest,nbt={Item:{id:\"minecraft_armor_weapon:skin_of_dragon\"}}]ANDEQglobal:aaa5CUSTOM:LokiTheTricksterCUSTOM:Killminecraft_armor_weapon:armor_stand_tobasu_tick_killminecraft_armor_weapon:armor_stand_tobasu_tickminecraft_armor_weapon:test_bow_tick/kill @e[type=minecraft_armor_weapon:projectile_test_bow]CUSTOM:TestBowEQglobal:aaa2global:ddd普通の矢EQglobal:aaa3global:ddd直線の矢EQglobal:aaa4global:ddd同じ高さEQglobal:aaa5global:ddd拡散EQglobal:aaa6global:ddd速めの矢EQglobal:aaa7global:ddd彗星GTEglobal:aaa8global:aaa2global:ddd普通の矢execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_item_stand_amor_stand] if entity @s[nbt=!{HandItems:[{id:\"minecraft_armor_weapon:luna\"}]}] run kill @sexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft:bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_functionexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:wither_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_wither_skeletonexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:stray_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_strayexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:stray_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_strayANDANDCUSTOM:TunderbolteffrctEQCustomModelData1ORORCUSTOM:KurikarakenCUSTOM:KurikarakenswordCUSTOM:KurikarakenutigatanaCustomModelData0execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run effect give @s minecraft_armor_weapon:alchemy_craft_block_effect 1 1 trueexecute at @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run tp @s ~ ~ ~ ~-.5 ~clearexecute at @e[tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run function minecraft_armor_weapon:alchemymod1execute at @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] if block ~ ~ ~ minecraft_armor_weapon:alchemy_craft_block run function minecraft_armor_weapon:alchemymod1" + "procedurexml": "EQTRUECUSTOM:TestBowtagNameplayer_ticksEntityPlayerteam join minecraft_armor_weapon_dark_purple @e[type=item,limit=1,sort=nearest,nbt={Item:{id:\"minecraft_armor_weapon:skin_of_dragon\"}}]ANDEQglobal:aaa5CUSTOM:LokiTheTricksterCUSTOM:Killminecraft_armor_weapon:armor_stand_tobasu_tick_killminecraft_armor_weapon:armor_stand_tobasu_tickminecraft_armor_weapon:test_bow_tick/kill @e[type=minecraft_armor_weapon:projectile_test_bow]CUSTOM:TestBowEQglobal:aaa2global:ddd普通の矢EQglobal:aaa3global:ddd直線の矢EQglobal:aaa4global:ddd同じ高さEQglobal:aaa5global:ddd拡散EQglobal:aaa6global:ddd速めの矢EQglobal:aaa7global:ddd彗星GTEglobal:aaa8global:aaa2global:ddd普通の矢execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_item_stand_amor_stand] if entity @s[nbt=!{HandItems:[{id:\"minecraft_armor_weapon:luna\"}]}] run kill @sexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft:bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_functionexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:wither_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_wither_skeletonexecute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:stray_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_strayANDANDCUSTOM:TunderbolteffrctEQCustomModelData1ORORCUSTOM:KurikarakenCUSTOM:KurikarakenswordCUSTOM:KurikarakenutigatanaCustomModelData0execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_item_stand_amor_stand] if entity @s[nbt=!{HandItems:[{id:\"minecraft_armor_weapon:luna\"}]}] run kill @sexecute at @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:iron_katana\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft:beacon\",Count:16b}},distance=..0.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..0.5] if block ~ ~-1 ~ minecraft_armor_weapon:alchemy_craft_block run function minecraft_armor_weapon:sword_stand_lunaexecute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run effect give @s minecraft_armor_weapon:alchemy_craft_block_effect 1 1 trueexecute at @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run tp @s ~ ~ ~ ~-.5 ~clearexecute at @e[tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run function minecraft_armor_weapon:alchemymod1execute at @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] if block ~ ~ ~ minecraft_armor_weapon:alchemy_craft_block run function minecraft_armor_weapon:alchemymod1" } } \ No newline at end of file diff --git a/elements/SwordStandLuna.mod.json b/elements/SwordStandLuna.mod.json index 54fee2ac..5503148e 100644 --- a/elements/SwordStandLuna.mod.json +++ b/elements/SwordStandLuna.mod.json @@ -2,7 +2,7 @@ "_fv": 43, "_type": "function", "definition": { - "code": "summon minecraft:armor_stand ~-0.3 ~-0.5 ~0.025 {Invisible:true,Invulnerable:true,PersistenceRequired:true,NoBasePlate:true,NoGravity:true,ShowArms:true,DisabledSlots:65537,Pose:{RightArm:[90f,90f,0f]},HandItems:[{id:\"minecraft_armor_weapon:luna\",Count:1},{}],Tags:[\"minecraft_armor_weapon_item_stand_amor_stand\"]}\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft_armor_weapon:iron_katana\",Count:1b}}]\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft:beacon\",Count:16b}}]\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}}]\nparticle minecraft:cloud ~ ~1.5 ~ 1 1 1 0.1 200 normal\nparticle minecraft:end_rod ~ ~1.5 ~ 0.4 5 0.4 0.0 200 normal", + "code": "summon minecraft:armor_stand ~-0.3 ~-0.5 ~0.025 {Invisible:true,Invulnerable:true,PersistenceRequired:true,NoBasePlate:true,NoGravity:true,ShowArms:true,DisabledSlots:65537,Pose:{RightArm:[90f,90f,0f]},HandItems:[{id:\"minecraft_armor_weapon:luna\",Count:1},{}],Tags:[\"minecraft_armor_weapon_item_stand_amor_stand\"]}\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft_armor_weapon:iron_katana\",Count:1b}}]\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft:beacon\",Count:16b}}]\nkill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}}]\nplaysound minecraft:block.beacon.activate block @a ~ ~ ~ 5 2\nparticle minecraft:cloud ~ ~1.5 ~ 1 1 1 0.1 200 normal\nparticle minecraft:end_rod ~ ~1.5 ~ 0.4 5 0.4 0.0 200 normal", "name": "sword_stand_luna", "namespace": "mod" } diff --git a/minecraft_armor_weapon.mcreator b/minecraft_armor_weapon.mcreator index a1e1f6f7..87943dd6 100644 --- a/minecraft_armor_weapon.mcreator +++ b/minecraft_armor_weapon.mcreator @@ -9089,6 +9089,10 @@ { "name": "entity", "type": "entity" + }, + { + "name": "world", + "type": "world" } ] } @@ -9108,10 +9112,6 @@ { "name": "entity", "type": "entity" - }, - { - "name": "world", - "type": "world" } ] } @@ -9376,13 +9376,13 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.illusioner_armor_boots": "Illusioner Armor Boots", + "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "item.minecraft_armor_weapon.darkness": "§5Darkness", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "entity.minecraft_armor_weapon.comet_kill": "Comet", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "item.minecraft_armor_weapon.darkness": "§5Darkness", "block.minecraft_armor_weapon.stone_katana_block": "Netherite Katana Block", "item.minecraft_armor_weapon.blackhole_spawn_egg": "Blackhole Spawn Egg", "entity.minecraft_armor_weapon.blackhole": "Blackhole", @@ -9408,8 +9408,8 @@ "block.minecraft_armor_weapon.stone_bricks_trap_door": "Stone Bricks Trap Door", "item.minecraft_armor_weapon.stone_katana": "§7Stone Katana", "item.minecraft_armor_weapon.dragon_black_armor_helmet": "§8Dragon black helmet", - "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", + "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.a": "A", @@ -9420,9 +9420,9 @@ "effect.minecraft_armor_weapon.long_range_weapon_cut": "遠距離武器斬る", "item.minecraft_armor_weapon.bogged_outer_chestplate": "Bogged Outer Chestplate", "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots", - "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", - "item.minecraft_armor_weapon.magicwand": "Magicwand", "effect.minecraft_armor_weapon.alchemy_craft_block_effect": "Alchemy Craft Block Effect", + "item.minecraft_armor_weapon.magicwand": "Magicwand", + "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots", "entity.minecraft_armor_weapon.killotiru": "Otiruyo", "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru", @@ -9640,13 +9640,13 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.illusioner_armor_boots": "Illusioner Armor Boots", + "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "entity.minecraft_armor_weapon.comet_kill": "Comet", - "item.minecraft_armor_weapon.darkness": "§5Darkness", "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "item.minecraft_armor_weapon.darkness": "§5Darkness", + "entity.minecraft_armor_weapon.comet_kill": "Comet", "block.minecraft_armor_weapon.stone_katana_block": "Netherite Katana Block", "item.minecraft_armor_weapon.blackhole_spawn_egg": "Blackhole Spawn Egg", "entity.minecraft_armor_weapon.blackhole": "Blackhole", @@ -9672,8 +9672,8 @@ "block.minecraft_armor_weapon.stone_bricks_trap_door": "Stone Bricks Trap Door", "item.minecraft_armor_weapon.dragon_black_armor_helmet": "§8Dragon black helmet", "item.minecraft_armor_weapon.stone_katana": "§7石の刀", - "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", + "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.a": "A", @@ -9684,9 +9684,9 @@ "item.minecraft_armor_weapon.bogged_outer_chestplate": "Bogged Outer Chestplate", "effect.minecraft_armor_weapon.long_range_weapon_cut": "遠距離武器斬る", "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots", - "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", - "item.minecraft_armor_weapon.magicwand": "Magicwand", "effect.minecraft_armor_weapon.alchemy_craft_block_effect": "Alchemy Craft Block Effect", + "item.minecraft_armor_weapon.magicwand": "Magicwand", + "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", "entity.minecraft_armor_weapon.killotiru": "Otiruyo", "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots", "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru", diff --git a/src/main/java/minecraftarmorweapon/potion/NannkasouNightVisionMobEffect.java b/src/main/java/minecraftarmorweapon/potion/NannkasouNightVisionMobEffect.java index 3cf44e9d..53d07e62 100644 --- a/src/main/java/minecraftarmorweapon/potion/NannkasouNightVisionMobEffect.java +++ b/src/main/java/minecraftarmorweapon/potion/NannkasouNightVisionMobEffect.java @@ -28,7 +28,7 @@ public String getDescriptionId() { @Override public void addAttributeModifiers(LivingEntity entity, AttributeMap attributeMap, int amplifier) { - NannkasouNightVisionEffectStartedappliedProcedure.execute(entity); + NannkasouNightVisionEffectStartedappliedProcedure.execute(entity.level, entity); } @Override @@ -39,7 +39,7 @@ public void applyEffectTick(LivingEntity entity, int amplifier) { @Override public void removeAttributeModifiers(LivingEntity entity, AttributeMap attributeMap, int amplifier) { super.removeAttributeModifiers(entity, attributeMap, amplifier); - NannkasouNightVisionEffectExpiresProcedure.execute(entity.level, entity); + NannkasouNightVisionEffectExpiresProcedure.execute(entity); } @Override diff --git a/src/main/java/minecraftarmorweapon/procedures/IronKatanaturuwoShoudeChituteiruJiannoteitukuProcedure.java b/src/main/java/minecraftarmorweapon/procedures/IronKatanaturuwoShoudeChituteiruJiannoteitukuProcedure.java index a6d7f1c7..e48a080c 100644 --- a/src/main/java/minecraftarmorweapon/procedures/IronKatanaturuwoShoudeChituteiruJiannoteitukuProcedure.java +++ b/src/main/java/minecraftarmorweapon/procedures/IronKatanaturuwoShoudeChituteiruJiannoteitukuProcedure.java @@ -276,8 +276,6 @@ Comparator compareDistOf(double _x, double _y, double _z) { } } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == MinecraftArmorWeaponModItems.LUNA.get()) { - if (entity instanceof LivingEntity _entity && !_entity.level.isClientSide()) - _entity.addEffect(new MobEffectInstance(MinecraftArmorWeaponModMobEffects.NANNKASOU_NIGHT_VISION.get(), 1, 255, true, false)); if (EnchantmentHelper.getItemEnchantmentLevel(MinecraftArmorWeaponModEnchantments.DEMONIZED.get(), (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY)) != 0) { if (entity instanceof LivingEntity _entity && !_entity.level.isClientSide()) _entity.addEffect(new MobEffectInstance(MinecraftArmorWeaponModMobEffects.ARROW_1.get(), 2, 1, true, false)); diff --git a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectExpiresProcedure.java b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectExpiresProcedure.java index b1498593..41f093ac 100644 --- a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectExpiresProcedure.java +++ b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectExpiresProcedure.java @@ -1,23 +1,16 @@ package minecraftarmorweapon.procedures; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Entity; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffectInstance; -import minecraftarmorweapon.MinecraftArmorWeaponMod; - public class NannkasouNightVisionEffectExpiresProcedure { - public static void execute(LevelAccessor world, Entity entity) { + public static void execute(Entity entity) { if (entity == null) return; - if (entity instanceof LivingEntity _entity) - _entity.removeEffect(MobEffects.NIGHT_VISION); - MinecraftArmorWeaponMod.queueServerWork(2, () -> { - if (entity instanceof LivingEntity _entity && !_entity.level.isClientSide()) - _entity.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, (int) entity.getPersistentData().getDouble("minecraft_armor_weapon_sword_night_vision_tick"), - (int) entity.getPersistentData().getDouble("minecraft_armor_weapon_sword_night_vision_lavel"), false, false)); - }); + if (entity instanceof LivingEntity _entity && !_entity.level.isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, (int) entity.getPersistentData().getDouble("minecraft_armor_weapon_sword_night_vision_tick"), + (int) entity.getPersistentData().getDouble("minecraft_armor_weapon_sword_night_vision_lavel"))); } } diff --git a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectStartedappliedProcedure.java b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectStartedappliedProcedure.java index 66ae06e1..c5e9f49e 100644 --- a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectStartedappliedProcedure.java +++ b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionEffectStartedappliedProcedure.java @@ -1,11 +1,16 @@ package minecraftarmorweapon.procedures; +import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Entity; import net.minecraft.world.effect.MobEffects; +import minecraftarmorweapon.init.MinecraftArmorWeaponModMobEffects; + +import minecraftarmorweapon.MinecraftArmorWeaponMod; + public class NannkasouNightVisionEffectStartedappliedProcedure { - public static void execute(Entity entity) { + public static void execute(LevelAccessor world, Entity entity) { if (entity == null) return; if (entity instanceof LivingEntity _livEnt ? _livEnt.hasEffect(MobEffects.NIGHT_VISION) : false) { @@ -13,5 +18,10 @@ public static void execute(Entity entity) { entity.getPersistentData().putDouble("minecraft_armor_weapon_sword_night_vision_lavel", (entity instanceof LivingEntity _livEnt && _livEnt.hasEffect(MobEffects.NIGHT_VISION) ? _livEnt.getEffect(MobEffects.NIGHT_VISION).getAmplifier() : 0)); } + MinecraftArmorWeaponMod.queueServerWork( + entity instanceof LivingEntity _livEnt && _livEnt.hasEffect(MinecraftArmorWeaponModMobEffects.NANNKASOU_NIGHT_VISION.get()) ? _livEnt.getEffect(MinecraftArmorWeaponModMobEffects.NANNKASOU_NIGHT_VISION.get()).getDuration() : 0, () -> { + if (entity instanceof LivingEntity _entity) + _entity.removeEffect(MobEffects.NIGHT_VISION); + }); } } diff --git a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionOnEffectActiveTickProcedure.java b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionOnEffectActiveTickProcedure.java index 0369070a..6249348e 100644 --- a/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionOnEffectActiveTickProcedure.java +++ b/src/main/java/minecraftarmorweapon/procedures/NannkasouNightVisionOnEffectActiveTickProcedure.java @@ -10,6 +10,6 @@ public static void execute(Entity entity) { if (entity == null) return; if (entity instanceof LivingEntity _entity && !_entity.level.isClientSide()) - _entity.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, 200, 255, false, true)); + _entity.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, 250, 255, true, false)); } } diff --git a/src/main/java/minecraftarmorweapon/procedures/SkinOfDragonTickProcedure.java b/src/main/java/minecraftarmorweapon/procedures/SkinOfDragonTickProcedure.java index 2d96703e..9e247284 100644 --- a/src/main/java/minecraftarmorweapon/procedures/SkinOfDragonTickProcedure.java +++ b/src/main/java/minecraftarmorweapon/procedures/SkinOfDragonTickProcedure.java @@ -168,9 +168,6 @@ private static void execute(@Nullable Event event, LevelAccessor world, double x if (world instanceof ServerLevel _level) _level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(), "execute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:stray_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_stray"); - if (world instanceof ServerLevel _level) - _level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(), - "execute at @e[type=item,nbt={Item:{id:\"minecraft:nether_star\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:stray_bone\",Count:16b}},distance=..1.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..1.5] run function minecraft_armor_weapon:hardentity_function_stray"); if (!(entity instanceof LivingEntity _livEnt ? _livEnt.hasEffect(MinecraftArmorWeaponModMobEffects.TUNDERBOLTEFFRCT.get()) : false) && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("CustomModelData") == 1 && ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == MinecraftArmorWeaponModItems.KURIKARAKEN.get() @@ -178,7 +175,13 @@ private static void execute(@Nullable Event event, LevelAccessor world, double x || (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == MinecraftArmorWeaponModItems.KURIKARAKENUTIGATANA.get())) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("CustomModelData", 0); } + if (world instanceof ServerLevel _level) + _level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(), + "execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_item_stand_amor_stand] if entity @s[nbt=!{HandItems:[{id:\"minecraft_armor_weapon:luna\"}]}] run kill @s"); } + if (world instanceof ServerLevel _level) + _level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(), + "execute at @e[type=item,nbt={Item:{id:\"minecraft_armor_weapon:iron_katana\"}}] if entity @e[type=item,nbt={Item:{id:\"minecraft:beacon\",Count:16b}},distance=..0.5] if entity @e[type=item,nbt={Item:{id:\"minecraft:iron_block\",Count:64b}},distance=..0.5] if block ~ ~-1 ~ minecraft_armor_weapon:alchemy_craft_block run function minecraft_armor_weapon:sword_stand_luna"); if (world instanceof ServerLevel _level) _level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(), "execute as @e[type=minecraft:armor_stand, tag=minecraft_armor_weapon_alchemy_craft_block_mahouzinn] run effect give @s minecraft_armor_weapon:alchemy_craft_block_effect 1 1 true"); diff --git a/src/main/resources/assets/minecraft_armor_weapon/lang/en_us.json b/src/main/resources/assets/minecraft_armor_weapon/lang/en_us.json index e5b3df53..41712f16 100644 --- a/src/main/resources/assets/minecraft_armor_weapon/lang/en_us.json +++ b/src/main/resources/assets/minecraft_armor_weapon/lang/en_us.json @@ -5,13 +5,13 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.illusioner_armor_boots": "Illusioner Armor Boots", + "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "item.minecraft_armor_weapon.darkness": "§5Darkness", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "entity.minecraft_armor_weapon.comet_kill": "Comet", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "item.minecraft_armor_weapon.darkness": "§5Darkness", "block.minecraft_armor_weapon.stone_katana_block": "Netherite Katana Block", "item.minecraft_armor_weapon.blackhole_spawn_egg": "Blackhole Spawn Egg", "entity.minecraft_armor_weapon.blackhole": "Blackhole", @@ -37,8 +37,8 @@ "block.minecraft_armor_weapon.stone_bricks_trap_door": "Stone Bricks Trap Door", "item.minecraft_armor_weapon.stone_katana": "§7Stone Katana", "item.minecraft_armor_weapon.dragon_black_armor_helmet": "§8Dragon black helmet", - "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", + "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.a": "A", @@ -49,9 +49,9 @@ "effect.minecraft_armor_weapon.long_range_weapon_cut": "遠距離武器斬る", "item.minecraft_armor_weapon.bogged_outer_chestplate": "Bogged Outer Chestplate", "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots", - "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", - "item.minecraft_armor_weapon.magicwand": "Magicwand", "effect.minecraft_armor_weapon.alchemy_craft_block_effect": "Alchemy Craft Block Effect", + "item.minecraft_armor_weapon.magicwand": "Magicwand", + "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots", "entity.minecraft_armor_weapon.killotiru": "Otiruyo", "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru", diff --git a/src/main/resources/assets/minecraft_armor_weapon/lang/ja_jp.json b/src/main/resources/assets/minecraft_armor_weapon/lang/ja_jp.json index d46d8f1a..2c84b5e1 100644 --- a/src/main/resources/assets/minecraft_armor_weapon/lang/ja_jp.json +++ b/src/main/resources/assets/minecraft_armor_weapon/lang/ja_jp.json @@ -5,13 +5,13 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.illusioner_armor_boots": "Illusioner Armor Boots", + "item.minecraft_armor_weapon.das_herz_einer_fee_armor_helmet": "das herz einer fee armor helmet", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "entity.minecraft_armor_weapon.comet_kill": "Comet", - "item.minecraft_armor_weapon.darkness": "§5Darkness", "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "item.minecraft_armor_weapon.darkness": "§5Darkness", + "entity.minecraft_armor_weapon.comet_kill": "Comet", "block.minecraft_armor_weapon.stone_katana_block": "Netherite Katana Block", "item.minecraft_armor_weapon.blackhole_spawn_egg": "Blackhole Spawn Egg", "entity.minecraft_armor_weapon.blackhole": "Blackhole", @@ -37,8 +37,8 @@ "block.minecraft_armor_weapon.stone_bricks_trap_door": "Stone Bricks Trap Door", "item.minecraft_armor_weapon.dragon_black_armor_helmet": "§8Dragon black helmet", "item.minecraft_armor_weapon.stone_katana": "§7石の刀", - "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", + "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.a": "A", @@ -49,9 +49,9 @@ "item.minecraft_armor_weapon.bogged_outer_chestplate": "Bogged Outer Chestplate", "effect.minecraft_armor_weapon.long_range_weapon_cut": "遠距離武器斬る", "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots", - "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", - "item.minecraft_armor_weapon.magicwand": "Magicwand", "effect.minecraft_armor_weapon.alchemy_craft_block_effect": "Alchemy Craft Block Effect", + "item.minecraft_armor_weapon.magicwand": "Magicwand", + "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood", "entity.minecraft_armor_weapon.killotiru": "Otiruyo", "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots", "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru", diff --git a/src/main/resources/data/minecraft_armor_weapon/functions/sword_stand_luna.mcfunction b/src/main/resources/data/minecraft_armor_weapon/functions/sword_stand_luna.mcfunction index 2f888158..6b554a10 100644 --- a/src/main/resources/data/minecraft_armor_weapon/functions/sword_stand_luna.mcfunction +++ b/src/main/resources/data/minecraft_armor_weapon/functions/sword_stand_luna.mcfunction @@ -2,5 +2,6 @@ summon minecraft:armor_stand ~-0.3 ~-0.5 ~0.025 {Invisible:true,Invulnerable:tru kill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:"minecraft_armor_weapon:iron_katana",Count:1b}}] kill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:"minecraft:beacon",Count:16b}}] kill @e[sort=nearest,limit=1,type=item,nbt={Item:{id:"minecraft:iron_block",Count:64b}}] +playsound minecraft:block.beacon.activate block @a ~ ~ ~ 5 2 particle minecraft:cloud ~ ~1.5 ~ 1 1 1 0.1 200 normal particle minecraft:end_rod ~ ~1.5 ~ 0.4 5 0.4 0.0 200 normal \ No newline at end of file