diff --git a/The four primitives and Weapons-forge-1.19.2-30.jar b/The four primitives and Weapons-forge-1.19.2-30.jar deleted file mode 100644 index 67ff7d65..00000000 Binary files a/The four primitives and Weapons-forge-1.19.2-30.jar and /dev/null differ diff --git a/minecraft_armor_weapon.mcreator b/minecraft_armor_weapon.mcreator index 9756511e..7e89d1ba 100644 --- a/minecraft_armor_weapon.mcreator +++ b/minecraft_armor_weapon.mcreator @@ -9038,19 +9038,19 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "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.illusioner_armor_boots": "Illusioner Armor Boots", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "entity.minecraft_armor_weapon.comet_kill": "Comet", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "item.minecraft_armor_weapon.darkness": "§5Darkness", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "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", "advancements.magical_swordsman_achievements.descr": "§eGet Magisches feen katana", - "effect.minecraft_armor_weapon.suityuu": "suityuu", "entity.minecraft_armor_weapon.ruami_284": "ruami284", + "effect.minecraft_armor_weapon.suityuu": "suityuu", "advancements.you_have_become_a_vampire.descr": "You have become a vampire.", "effect.minecraft_armor_weapon.bakuhatu": "explosion", "effect.minecraft_armor_weapon.aaaa": "bunnsinn", @@ -9069,8 +9069,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.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.scythe": "Scythe", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.a": "A", @@ -9297,19 +9297,19 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "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.illusioner_armor_boots": "Illusioner Armor Boots", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", - "item.minecraft_armor_weapon.darkness": "§5Darkness", "entity.minecraft_armor_weapon.comet_kill": "Comet", + "item.minecraft_armor_weapon.darkness": "§5Darkness", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "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", "advancements.magical_swordsman_achievements.descr": "Magisches feen katanaを得る", - "effect.minecraft_armor_weapon.suityuu": "suityuu", "entity.minecraft_armor_weapon.ruami_284": "ruami284", + "effect.minecraft_armor_weapon.suityuu": "suityuu", "advancements.you_have_become_a_vampire.descr": "吸血鬼になったよ", "effect.minecraft_armor_weapon.bakuhatu": "explosion", "effect.minecraft_armor_weapon.aaaa": "bunnsinn", @@ -9328,8 +9328,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.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", + "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.a": "A", diff --git a/src/main/java/minecraftarmorweapon/item/TestBowItem.java b/src/main/java/minecraftarmorweapon/item/TestBowItem.java index a2aee714..9ba97b51 100644 --- a/src/main/java/minecraftarmorweapon/item/TestBowItem.java +++ b/src/main/java/minecraftarmorweapon/item/TestBowItem.java @@ -130,4 +130,5 @@ public static float getArrowVelocity(int charge) { return velocity; } + } 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 beaf88d4..ddab63d1 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,19 +5,19 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "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.illusioner_armor_boots": "Illusioner Armor Boots", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "entity.minecraft_armor_weapon.comet_kill": "Comet", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "item.minecraft_armor_weapon.darkness": "§5Darkness", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", + "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", "advancements.magical_swordsman_achievements.descr": "§eGet Magisches feen katana", - "effect.minecraft_armor_weapon.suityuu": "suityuu", "entity.minecraft_armor_weapon.ruami_284": "ruami284", + "effect.minecraft_armor_weapon.suityuu": "suityuu", "advancements.you_have_become_a_vampire.descr": "You have become a vampire.", "effect.minecraft_armor_weapon.bakuhatu": "explosion", "effect.minecraft_armor_weapon.aaaa": "bunnsinn", @@ -36,8 +36,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.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.scythe": "Scythe", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.a": "A", 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 ac3e0d0a..e68b6f27 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,19 +5,19 @@ "itemGroup.tabmagic_books": "Magic Books", "itemGroup.tabyopkeinamono": "建築とかに", "effect.minecraft_armor_weapon.syugeki": "aa", - "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.illusioner_armor_boots": "Illusioner Armor Boots", "item.minecraft_armor_weapon.ruami_284_spawn_egg": "ruami284 Spawn Egg", "entity.minecraft_armor_weapon.comet": "Comet", - "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", - "item.minecraft_armor_weapon.darkness": "§5Darkness", "entity.minecraft_armor_weapon.comet_kill": "Comet", + "item.minecraft_armor_weapon.darkness": "§5Darkness", + "effect.minecraft_armor_weapon.bow_attack": "illusioner_armor_effect", "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", "advancements.magical_swordsman_achievements.descr": "Magisches feen katanaを得る", - "effect.minecraft_armor_weapon.suityuu": "suityuu", "entity.minecraft_armor_weapon.ruami_284": "ruami284", + "effect.minecraft_armor_weapon.suityuu": "suityuu", "advancements.you_have_become_a_vampire.descr": "吸血鬼になったよ", "effect.minecraft_armor_weapon.bakuhatu": "explosion", "effect.minecraft_armor_weapon.aaaa": "bunnsinn", @@ -36,8 +36,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.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.kaminari_kurikaraken_sword": "Kaminari Kurikaraken Sword", + "item.minecraft_armor_weapon.kurikarakensword": "§5倶利伽羅剣", "item.minecraft_armor_weapon.wind_step": "§2Windstep", "item.minecraft_armor_weapon.scythe": "Scythe", "item.minecraft_armor_weapon.a": "A",