From 53f54433aff380bd596f422fcf32f9f85b463045 Mon Sep 17 00:00:00 2001 From: Anonymous Hacker Date: Sat, 4 Jun 2022 00:47:19 -0400 Subject: [PATCH] Major object renaming and refactoring, new small parts Rename a ton of various items. Gold objects are now gold(en). Wood objects are now wood(en). Smoke bombs and the related are now smoke grenades. Internally, musket ball entities are no longer referred to as "bullets", and are now "musket balls". Old entries will automatically be upgraded when opening an old world, so items will be preserved. New small parts; replacing the generic bomb parts and tool parts are the Grenade Assembly and Tool Joint. Fix broken entry in the battlefield camp structure. --- gradle.properties | 6 +- src/generated/resources/.cache/cache | 168 ++++++------ .../{wood_shard.json => golden_arrow.json} | 2 +- ..._bomb_arrow.json => golden_pike_head.json} | 2 +- .../models/item/grenade_assembly.json | 6 + .../small_parts_metal_throwable_bomb.json | 6 - .../models/item/smoke_bomb_arrow_blue.json | 6 - .../models/item/smoke_bomb_arrow_green.json | 6 - .../models/item/smoke_bomb_arrow_purple.json | 6 - .../models/item/smoke_bomb_arrow_red.json | 6 - .../models/item/smoke_bomb_arrow_yellow.json | 6 - .../models/item/smoke_grenade_arrow.json | 6 + .../models/item/smoke_grenade_arrow_blue.json | 6 + .../item/smoke_grenade_arrow_green.json | 6 + .../item/smoke_grenade_arrow_purple.json | 6 + ...tool.json => smoke_grenade_arrow_red.json} | 2 +- .../item/smoke_grenade_arrow_yellow.json | 6 + .../item/{gold_arrow.json => tool_joint.json} | 2 +- .../models/item/wood_pike_head.json | 6 - .../{wood_arrow.json => wooden_arrow.json} | 2 +- .../models/item/wooden_pike_head.json | 6 + .../{wood_tool_rod.json => wooden_shard.json} | 2 +- ...ld_pike_head.json => wooden_tool_rod.json} | 2 +- .../advancements/blunderbuss.json | 2 +- .../advancements/flare_gun.json | 2 +- .../advancements/flintlock_pistol.json | 2 +- .../advancements/gauntlet.json | 4 +- .../immersiveweapons/advancements/musket.json | 2 +- .../advancements/musket_ball.json | 2 +- .../immersiveweapons/advancements/pike.json | 4 +- .../{gold_arrow.json => golden_arrow.json} | 4 +- ...old_gauntlet.json => golden_gauntlet.json} | 4 +- ...sket_ball.json => golden_musket_ball.json} | 4 +- .../{gold_pike.json => golden_pike.json} | 4 +- ...d_pike_head.json => golden_pike_head.json} | 4 +- .../recipes/immersiveweapons/pliers.json | 2 +- .../smoke_bomb_arrow_purple.json | 34 --- .../smoke_bomb_arrow_yellow.json | 34 --- .../immersiveweapons/smoke_bomb_purple.json | 34 --- .../immersiveweapons/smoke_bomb_red.json | 34 --- .../immersiveweapons/smoke_bomb_yellow.json | 34 --- .../{smoke_bomb.json => smoke_grenade.json} | 4 +- ...mb_green.json => smoke_grenade_arrow.json} | 4 +- ...een.json => smoke_grenade_arrow_blue.json} | 4 +- .../smoke_grenade_arrow_green.json | 34 +++ .../smoke_grenade_arrow_purple.json | 34 +++ ...blue.json => smoke_grenade_arrow_red.json} | 4 +- .../smoke_grenade_arrow_yellow.json | 34 +++ ...bomb_blue.json => smoke_grenade_blue.json} | 4 +- .../immersiveweapons/smoke_grenade_green.json | 34 +++ ...row_red.json => smoke_grenade_purple.json} | 4 +- ...bomb_arrow.json => smoke_grenade_red.json} | 4 +- .../smoke_grenade_yellow.json | 34 +++ .../{wood_arrow.json => wooden_arrow.json} | 4 +- ...ood_gauntlet.json => wooden_gauntlet.json} | 4 +- ...sket_ball.json => wooden_musket_ball.json} | 4 +- .../{wood_pike.json => wooden_pike.json} | 4 +- ...od_tool_rod.json => wooden_pike_head.json} | 4 +- ...od_pike_head.json => wooden_tool_rod.json} | 4 +- .../immersiveweapons/advancements/shards.json | 2 +- ...rtss_table.json => small_parts_table.json} | 0 .../{smoke_bomb.json => smoke_grenade.json} | 10 +- .../advancements/tool_rod.json | 4 +- .../{wood_shard.json => wooden_shard.json} | 8 +- .../immersiveweapons/recipes/cobalt_pike.json | 2 +- .../immersiveweapons/recipes/copper_pike.json | 2 +- .../recipes/diamond_pike.json | 2 +- .../{gold_arrow.json => golden_arrow.json} | 2 +- ...old_gauntlet.json => golden_gauntlet.json} | 2 +- ...sket_ball.json => golden_musket_ball.json} | 2 +- .../{gold_pike.json => golden_pike.json} | 6 +- ...d_pike_head.json => golden_pike_head.json} | 2 +- .../recipes/ingots_metal_tinkering.json | 4 +- .../immersiveweapons/recipes/iron_pike.json | 2 +- .../data/immersiveweapons/recipes/pliers.json | 2 +- .../{smoke_bomb.json => smoke_grenade.json} | 6 +- ...mb_arrow.json => smoke_grenade_arrow.json} | 4 +- ...lue.json => smoke_grenade_arrow_blue.json} | 4 +- ...en.json => smoke_grenade_arrow_green.json} | 4 +- ...e.json => smoke_grenade_arrow_purple.json} | 4 +- ..._red.json => smoke_grenade_arrow_red.json} | 4 +- ...w.json => smoke_grenade_arrow_yellow.json} | 4 +- ...bomb_blue.json => smoke_grenade_blue.json} | 6 +- ...mb_green.json => smoke_grenade_green.json} | 6 +- ..._purple.json => smoke_grenade_purple.json} | 6 +- ...e_bomb_red.json => smoke_grenade_red.json} | 6 +- ..._yellow.json => smoke_grenade_yellow.json} | 6 +- .../recipes/smoke_powder.json | 2 +- .../immersiveweapons/recipes/stone_pike.json | 2 +- .../{wood_arrow.json => wooden_arrow.json} | 2 +- ...ood_gauntlet.json => wooden_gauntlet.json} | 2 +- ...sket_ball.json => wooden_musket_ball.json} | 2 +- .../{wood_pike.json => wooden_pike.json} | 6 +- ...d_pike_head.json => wooden_pike_head.json} | 2 +- ...ood_tool_rod.json => wooden_tool_rod.json} | 2 +- .../tags/items/projectiles/musket_balls.json | 4 +- .../tags/items/shards/wood.json | 2 +- .../data/minecraft/tags/items/arrows.json | 16 +- .../client/TooltipHandler.java | 106 ++++---- .../SmokeGrenadeParticle.java} | 16 +- .../SmokeGrenadeParticleOptions.java} | 49 ++-- .../immersiveweapons/config/CommonConfig.java | 10 +- .../data/advancements/IWAdvancements.java | 38 +-- .../data/models/lists/ItemModelLists.java | 24 +- .../data/recipes/RecipeGenerator.java | 118 ++++----- .../data/tags/ItemTagsGenerator.java | 2 +- .../ImmersiveWeaponsItemTagGroups.java | 2 +- .../data/tags/lists/ItemTagLists.java | 20 +- .../entity/projectile/BulletEntities.java | 68 ++--- .../entity/projectile/CustomArrowEntity.java | 90 +++---- ...ombEntity.java => SmokeGrenadeEntity.java} | 58 ++-- .../event/ClientModEventSubscriber.java | 28 +- .../event/ForgeEventSubscriber.java | 250 +++++++++++++++++- .../event/ModEventSubscriber.java | 20 +- .../init/DeferredRegistryHandler.java | 98 +++---- .../init/DispenserBehaviorRegistry.java | 141 +++++----- .../immersiveweapons/init/PacketHandler.java | 20 +- .../init/PostSetupHandler.java | 16 +- ...ntletItem.java => GoldenGauntletItem.java} | 16 +- ...ntletItem.java => WoodenGauntletItem.java} | 12 +- ...{GoldPikeItem.java => GoldenPikeItem.java} | 12 +- ...{WoodPikeItem.java => WoodenPikeItem.java} | 12 +- ...oldArrowItem.java => GoldenArrowItem.java} | 11 +- ...owItem.java => SmokeGrenadeArrowItem.java} | 17 +- ...oodArrowItem.java => WoodenArrowItem.java} | 11 +- .../projectile/bullet/AbstractBulletItem.java | 2 +- ...letItem.java => CobaltMusketBallItem.java} | 10 +- ...letItem.java => CopperMusketBallItem.java} | 11 +- ...etItem.java => DiamondMusketBallItem.java} | 11 +- ...letItem.java => GoldenMusketBallItem.java} | 11 +- ...ulletItem.java => IronMusketBallItem.java} | 11 +- ...Item.java => NetheriteMusketBallItem.java} | 11 +- ...lletItem.java => StoneMusketBallItem.java} | 11 +- ...letItem.java => WoodenMusketBallItem.java} | 11 +- .../item/projectile/gun/AbstractGunItem.java | 2 +- ...okeBombItem.java => SmokeGrenadeItem.java} | 18 +- .../assets/immersiveweapons/lang/en_us.json | 105 ++++---- ...old_gauntlet.json => golden_gauntlet.json} | 0 ...sket_ball.json => golden_musket_ball.json} | 4 +- .../item/{gold_pike.json => golden_pike.json} | 0 .../{smoke_bomb.json => smoke_grenade.json} | 0 ...bomb_blue.json => smoke_grenade_blue.json} | 0 ...mb_green.json => smoke_grenade_green.json} | 0 ..._purple.json => smoke_grenade_purple.json} | 0 ...e_bomb_red.json => smoke_grenade_red.json} | 0 ..._yellow.json => smoke_grenade_yellow.json} | 0 ...ood_gauntlet.json => wooden_gauntlet.json} | 0 ...sket_ball.json => wooden_musket_ball.json} | 4 +- .../item/{wood_pike.json => wooden_pike.json} | 0 .../{smoke_bomb.json => smoke_grenade.json} | 0 .../assets/immersiveweapons/sounds.json | 6 +- ...e_bomb_hiss.ogg => smoke_grenade_hiss.ogg} | Bin .../item/{gold_arrow.png => golden_arrow.png} | Bin ...musket_ball.png => golden_musket_ball.png} | Bin ...old_pike_head.png => golden_pike_head.png} | Bin .../textures/item/grenade_assembly.png | Bin 0 -> 208 bytes .../item/small_parts_metal_throwable_bomb.png | Bin 282 -> 0 bytes .../textures/item/small_parts_metal_tool.png | Bin 268 -> 0 bytes ...bomb_arrow.png => smoke_grenade_arrow.png} | Bin ..._blue.png => smoke_grenade_arrow_blue.png} | Bin ...reen.png => smoke_grenade_arrow_green.png} | Bin ...ple.png => smoke_grenade_arrow_purple.png} | Bin ...ow_red.png => smoke_grenade_arrow_red.png} | Bin ...low.png => smoke_grenade_arrow_yellow.png} | Bin .../textures/item/tool_joint.png | Bin 0 -> 226 bytes .../item/{wood_arrow.png => wooden_arrow.png} | Bin ...musket_ball.png => wooden_musket_ball.png} | Bin ...ood_pike_head.png => wooden_pike_head.png} | Bin .../item/{wood_shard.png => wooden_shard.png} | Bin ...{wood_tool_rod.png => wooden_tool_rod.png} | Bin .../ammunition/bullet_velocities_info.json | 2 +- .../{gold_arrow.json => golden_arrow.json} | 4 +- ...sket_ball.json => golden_musket_ball.json} | 4 +- .../en_us/entries/ammunition/smoke_arrow.json | 18 +- .../{wood_arrow.json => wooden_arrow.json} | 6 +- ...sket_ball.json => wooden_musket_ball.json} | 6 +- .../entries/crafting/small_parts_table.json | 8 +- .../en_us/entries/firearms/blunderbuss.json | 2 +- .../en_us/entries/firearms/flare_gun.json | 2 +- .../{flintlock.json => flintlock_pistol.json} | 4 +- .../en_us/entries/firearms/musket.json | 26 ++ .../gauntlets/{gold.json => golden.json} | 4 +- .../gauntlets/{wood.json => wooden.json} | 4 +- .../getting_started/lost_encyclopedia.json | 2 +- .../getting_started/moving_forward.json | 2 +- .../getting_started/preparing_your_base.json | 2 +- .../using_the_encyclopedia.json | 2 +- .../getting_started/where_to_begin.json | 2 +- .../entries/pikes/{gold.json => golden.json} | 6 +- .../entries/pikes/{wood.json => wooden.json} | 8 +- .../en_us/entries/resources/rods.json | 4 +- .../en_us/entries/throwables/smoke_bomb.json | 26 -- .../entries/throwables/smoke_grenade.json | 26 ++ .../structures/battlefield_camp.nbt | Bin 6328 -> 6324 bytes 194 files changed, 1396 insertions(+), 1125 deletions(-) rename src/generated/resources/assets/immersiveweapons/models/item/{wood_shard.json => golden_arrow.json} (55%) rename src/generated/resources/assets/immersiveweapons/models/item/{smoke_bomb_arrow.json => golden_pike_head.json} (53%) create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/grenade_assembly.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow.json create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json rename src/generated/resources/assets/immersiveweapons/models/item/{small_parts_metal_tool.json => smoke_grenade_arrow_red.json} (50%) create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json rename src/generated/resources/assets/immersiveweapons/models/item/{gold_arrow.json => tool_joint.json} (56%) delete mode 100644 src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json rename src/generated/resources/assets/immersiveweapons/models/item/{wood_arrow.json => wooden_arrow.json} (55%) create mode 100644 src/generated/resources/assets/immersiveweapons/models/item/wooden_pike_head.json rename src/generated/resources/assets/immersiveweapons/models/item/{wood_tool_rod.json => wooden_shard.json} (54%) rename src/generated/resources/assets/immersiveweapons/models/item/{gold_pike_head.json => wooden_tool_rod.json} (53%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{gold_arrow.json => golden_arrow.json} (84%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{gold_gauntlet.json => golden_gauntlet.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{gold_musket_ball.json => golden_musket_ball.json} (82%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{gold_pike.json => golden_pike.json} (84%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{gold_pike_head.json => golden_pike_head.json} (83%) delete mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_purple.json delete mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_yellow.json delete mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_purple.json delete mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_red.json delete mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_yellow.json rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb.json => smoke_grenade.json} (85%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_green.json => smoke_grenade_arrow.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_arrow_green.json => smoke_grenade_arrow_blue.json} (82%) create mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_green.json create mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_purple.json rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_arrow_blue.json => smoke_grenade_arrow_red.json} (82%) create mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_yellow.json rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_blue.json => smoke_grenade_blue.json} (84%) create mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_green.json rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_arrow_red.json => smoke_grenade_purple.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{smoke_bomb_arrow.json => smoke_grenade_red.json} (84%) create mode 100644 src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_yellow.json rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_arrow.json => wooden_arrow.json} (84%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_gauntlet.json => wooden_gauntlet.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_musket_ball.json => wooden_musket_ball.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_pike.json => wooden_pike.json} (84%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_tool_rod.json => wooden_pike_head.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/{wood_pike_head.json => wooden_tool_rod.json} (83%) rename src/generated/resources/data/immersiveweapons/advancements/{small_partss_table.json => small_parts_table.json} (100%) rename src/generated/resources/data/immersiveweapons/advancements/{smoke_bomb.json => smoke_grenade.json} (60%) rename src/generated/resources/data/immersiveweapons/advancements/{wood_shard.json => wooden_shard.json} (67%) rename src/generated/resources/data/immersiveweapons/recipes/{gold_arrow.json => golden_arrow.json} (87%) rename src/generated/resources/data/immersiveweapons/recipes/{gold_gauntlet.json => golden_gauntlet.json} (84%) rename src/generated/resources/data/immersiveweapons/recipes/{gold_musket_ball.json => golden_musket_ball.json} (83%) rename src/generated/resources/data/immersiveweapons/recipes/{gold_pike.json => golden_pike.json} (62%) rename src/generated/resources/data/immersiveweapons/recipes/{gold_pike_head.json => golden_pike_head.json} (83%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb.json => smoke_grenade.json} (67%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow.json => smoke_grenade_arrow.json} (75%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow_blue.json => smoke_grenade_arrow_blue.json} (77%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow_green.json => smoke_grenade_arrow_green.json} (77%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow_purple.json => smoke_grenade_arrow_purple.json} (77%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow_red.json => smoke_grenade_arrow_red.json} (77%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_arrow_yellow.json => smoke_grenade_arrow_yellow.json} (77%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_blue.json => smoke_grenade_blue.json} (69%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_green.json => smoke_grenade_green.json} (69%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_purple.json => smoke_grenade_purple.json} (69%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_red.json => smoke_grenade_red.json} (70%) rename src/generated/resources/data/immersiveweapons/recipes/{smoke_bomb_yellow.json => smoke_grenade_yellow.json} (69%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_arrow.json => wooden_arrow.json} (87%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_gauntlet.json => wooden_gauntlet.json} (84%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_musket_ball.json => wooden_musket_ball.json} (83%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_pike.json => wooden_pike.json} (62%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_pike_head.json => wooden_pike_head.json} (83%) rename src/generated/resources/data/immersiveweapons/recipes/{wood_tool_rod.json => wooden_tool_rod.json} (79%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/{smoke_bomb/SmokeBombParticle.java => smoke_grenade/SmokeGrenadeParticle.java} (75%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/{smoke_bomb/SmokeBombParticleOptions.java => smoke_grenade/SmokeGrenadeParticleOptions.java} (60%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/{SmokeBombEntity.java => SmokeGrenadeEntity.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/{GoldGauntletItem.java => GoldenGauntletItem.java} (67%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/{WoodGauntletItem.java => WoodenGauntletItem.java} (70%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/{GoldPikeItem.java => GoldenPikeItem.java} (75%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/{WoodPikeItem.java => WoodenPikeItem.java} (73%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/{GoldArrowItem.java => GoldenArrowItem.java} (63%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/{SmokeBombArrowItem.java => SmokeGrenadeArrowItem.java} (59%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/{WoodArrowItem.java => WoodenArrowItem.java} (63%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{CobaltBulletItem.java => CobaltMusketBallItem.java} (73%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{CopperBulletItem.java => CopperMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{DiamondBulletItem.java => DiamondMusketBallItem.java} (69%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{GoldBulletItem.java => GoldenMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{IronBulletItem.java => IronMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{NetheriteBulletItem.java => NetheriteMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{StoneBulletItem.java => StoneMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/{WoodBulletItem.java => WoodenMusketBallItem.java} (68%) rename src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/{SmokeBombItem.java => SmokeGrenadeItem.java} (78%) rename src/main/resources/assets/immersiveweapons/models/item/{gold_gauntlet.json => golden_gauntlet.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{wood_musket_ball.json => golden_musket_ball.json} (97%) rename src/main/resources/assets/immersiveweapons/models/item/{gold_pike.json => golden_pike.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb.json => smoke_grenade.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb_blue.json => smoke_grenade_blue.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb_green.json => smoke_grenade_green.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb_purple.json => smoke_grenade_purple.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb_red.json => smoke_grenade_red.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{smoke_bomb_yellow.json => smoke_grenade_yellow.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{wood_gauntlet.json => wooden_gauntlet.json} (100%) rename src/main/resources/assets/immersiveweapons/models/item/{gold_musket_ball.json => wooden_musket_ball.json} (97%) rename src/main/resources/assets/immersiveweapons/models/item/{wood_pike.json => wooden_pike.json} (100%) rename src/main/resources/assets/immersiveweapons/particles/{smoke_bomb.json => smoke_grenade.json} (100%) rename src/main/resources/assets/immersiveweapons/sounds/{smoke_bomb_hiss.ogg => smoke_grenade_hiss.ogg} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{gold_arrow.png => golden_arrow.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{gold_musket_ball.png => golden_musket_ball.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{gold_pike_head.png => golden_pike_head.png} (100%) create mode 100644 src/main/resources/assets/immersiveweapons/textures/item/grenade_assembly.png delete mode 100644 src/main/resources/assets/immersiveweapons/textures/item/small_parts_metal_throwable_bomb.png delete mode 100644 src/main/resources/assets/immersiveweapons/textures/item/small_parts_metal_tool.png rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow.png => smoke_grenade_arrow.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow_blue.png => smoke_grenade_arrow_blue.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow_green.png => smoke_grenade_arrow_green.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow_purple.png => smoke_grenade_arrow_purple.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow_red.png => smoke_grenade_arrow_red.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{smoke_bomb_arrow_yellow.png => smoke_grenade_arrow_yellow.png} (100%) create mode 100644 src/main/resources/assets/immersiveweapons/textures/item/tool_joint.png rename src/main/resources/assets/immersiveweapons/textures/item/{wood_arrow.png => wooden_arrow.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{wood_musket_ball.png => wooden_musket_ball.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{wood_pike_head.png => wooden_pike_head.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{wood_shard.png => wooden_shard.png} (100%) rename src/main/resources/assets/immersiveweapons/textures/item/{wood_tool_rod.png => wooden_tool_rod.png} (100%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/ammunition/{gold_arrow.json => golden_arrow.json} (85%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/ammunition/{gold_musket_ball.json => golden_musket_ball.json} (87%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/ammunition/{wood_arrow.json => wooden_arrow.json} (75%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/ammunition/{wood_musket_ball.json => wooden_musket_ball.json} (78%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/firearms/{flintlock.json => flintlock_pistol.json} (75%) create mode 100644 src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/firearms/musket.json rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/gauntlets/{gold.json => golden.json} (84%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/gauntlets/{wood.json => wooden.json} (81%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/pikes/{gold.json => golden.json} (74%) rename src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/pikes/{wood.json => wooden.json} (62%) delete mode 100644 src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/throwables/smoke_bomb.json create mode 100644 src/main/resources/data/immersiveweapons/patchouli_books/encyclopedia/en_us/entries/throwables/smoke_grenade.json diff --git a/gradle.properties b/gradle.properties index 625005778..96ca17fa8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ version=1.18.2-1.16.0 group=com.anonymoushacker1279.immersiveweapons mappings_channel=parchment mappings_version=2022.05.22-1.18.2 -forge_version=1.18.2-40.1.21 +forge_version=1.18.2-40.1.31 jei_version=1.18.2:9.5.5.174 -wthit_version=4.10.1 +wthit_version=4.10.3 badpackets_version=0.1.2 patchouli_version=1.18.2-67 -terrablender_version=1.18.2-1.1.0.99 \ No newline at end of file +terrablender_version=1.18.2-1.1.0.101 \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d9886e9f1..706ad1067 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -245,10 +245,11 @@ c0e5cb8299746b3ba64fba16b0ee0560607301d2 assets/immersiveweapons/models/item/fla 71c62e0b95b88379eb05dbf4034803b8ad7fe265 assets/immersiveweapons/models/item/flintlock_assembly.json d6cdd2dba32b9dd215f8697a484165303677d9ac assets/immersiveweapons/models/item/gadsden_flag.json 159123d6d3fa1141dc5c3f4974887f89118a889f assets/immersiveweapons/models/item/gauntlet_scaffolding.json -f0ee90bbfa89569daa28b790f026cbe178e27d6b assets/immersiveweapons/models/item/gold_arrow.json -0c7eeb996e6791d57819eddcd61186455d880d05 assets/immersiveweapons/models/item/gold_pike_head.json +91c6342e9087299a248f6c5229c1d4b006f5ad94 assets/immersiveweapons/models/item/golden_arrow.json +a01918d4cec30695140e1ded0dbdeedafb11ee94 assets/immersiveweapons/models/item/golden_pike_head.json b3f11387bc42773ebc84af7bddf111d19d3cf1ec assets/immersiveweapons/models/item/gray_stained_bulletproof_glass.json 16b7c56b4d9741bb40778f244219c4f21db24020 assets/immersiveweapons/models/item/green_stained_bulletproof_glass.json +7a3fef25c5fdbf0ebbbd33c66ea8e15b24f4bab6 assets/immersiveweapons/models/item/grenade_assembly.json d5e1c9824cafbb698e2291c88c0ac69c7c702318 assets/immersiveweapons/models/item/hans_head.json 98167609bf3898587f7565736a6fc24a7966cacd assets/immersiveweapons/models/item/hans_spawn_egg.json bc6a5e40741b47f89c63f940f518e91f58dbf64a assets/immersiveweapons/models/item/hardened_mud.json @@ -309,15 +310,13 @@ aee74d5ed5e46b58ad37606fe3cf7fb1522f932d assets/immersiveweapons/models/item/raw c5887bfc937166a3141825d7468a00abaceb4fc2 assets/immersiveweapons/models/item/scope.json 62b8240441ade5268c46704d7d8d00401806f328 assets/immersiveweapons/models/item/scope_mount.json 2e77c00c517978a1575e40c6dc65f24fbbd3e72d assets/immersiveweapons/models/item/short_iron_barrel.json -b786db7f684e7862fa702edd11c2aa3f7f9e4d74 assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json -11638393b3b92d5c3b5b5e23a16c613357b7262a assets/immersiveweapons/models/item/small_parts_metal_tool.json dd6983b2ad39b45b1f01745a7ff858707898e322 assets/immersiveweapons/models/item/small_parts_table.json -7555a62bd5e484d77ef5a62a75ed3afc11a59a6b assets/immersiveweapons/models/item/smoke_bomb_arrow.json -9bbde7f9fe554ecf281e30dbb5846a41027aee01 assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json -3629328e128f1a31cfe790a743f242bfa09517a0 assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json -2e977ee591220cd6193597892d73af6604eed7d4 assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json -fc08a9f7042b04138e0e5f79fc935ddad5fb566d assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json -8657f763c5c3c56398f0e2e7ce50900cbebf1cd5 assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json +b83f3d62f6fa7379eedf1b3d95939346e14887d4 assets/immersiveweapons/models/item/smoke_grenade_arrow.json +747ffdaf3cb71831b739a54ba62782d9072b0fab assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json +596f5e4e856198b41f4b4273066f373e8fc48a6d assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json +86e9dd4c8a085798daf887167c71cbbcb60e697e assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json +74cdb9a9afcec558b592b84c7c4efefc8a17af3e assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json +7edc0677f956e459fe1efde311cf534f26b89137 assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json 92f426e45cd6d3f5cb1253f447ec7c3f98292752 assets/immersiveweapons/models/item/smoke_powder.json 544801965337cd3b8e7daffaa83726be68d1a557 assets/immersiveweapons/models/item/spruce_table.json 29af2daf23be78ccf1134b260dee7d7f774e9be0 assets/immersiveweapons/models/item/stone_arrow.json @@ -340,6 +339,7 @@ d576d505c712a382f7ca4fa7db0c2972383f063d assets/immersiveweapons/models/item/tes 932c3f111bf97f8de98c570f74a8b5ee2010006b assets/immersiveweapons/models/item/tesla_shovel.json 9c304305138dc67073b2dd5d304862d693cd2093 assets/immersiveweapons/models/item/tesla_sword.json 7ba38d3fbcff25a86dee7681a0545c172687a2bd assets/immersiveweapons/models/item/tesla_synthesizer.json +0deff2cd4dde8babbbea9aa05b59c3b1e10bd07d assets/immersiveweapons/models/item/tool_joint.json c5cc0e9f3bbd60805614812a5612032dc58a7405 assets/immersiveweapons/models/item/trigger_assembly.json cfaa0dfad7ce6b9d0bd866e59c9e24aa8fe1d9ad assets/immersiveweapons/models/item/troll_flag.json 5abe940ea21e5878d6e4daf78fc74679d62f7f54 assets/immersiveweapons/models/item/used_syringe.json @@ -365,12 +365,12 @@ e391cdf96c4864acd93a6840a0b5a17a3174ab81 assets/immersiveweapons/models/item/war cd1c048af61919b7c0541a9ea07f0b970273a772 assets/immersiveweapons/models/item/warrior_statue_torso.json 74c782888a6d63df77ab5897dff16009ea6268f1 assets/immersiveweapons/models/item/white_stained_bulletproof_glass.json 292004d39b38f7b875fe7fbcd300ae39fb9a9d2d assets/immersiveweapons/models/item/wide_golden_barrel.json -f286283939539a6f97473604b718ccfcd9a95ce0 assets/immersiveweapons/models/item/wood_arrow.json -1ac6b1f7e8da4e8ced6d9ef9501686d37bc1aeba assets/immersiveweapons/models/item/wood_pike_head.json -41c796c877b1f49bbe73553b7893c6d195760356 assets/immersiveweapons/models/item/wood_shard.json -c51fc2240ec6a033466139d4d43a4520bb56e97c assets/immersiveweapons/models/item/wood_tool_rod.json +db57074410f216f5fe3606380ed340797b13c6fd assets/immersiveweapons/models/item/wooden_arrow.json +b6de9a2be15784582a734073b587501e4d31f190 assets/immersiveweapons/models/item/wooden_pike_head.json 9cc9eaf626695da0eecb48f09816c9adf2285614 assets/immersiveweapons/models/item/wooden_pistol_handle.json +379f9e8bf336ee462396447c63d05d6eae9c1bf8 assets/immersiveweapons/models/item/wooden_shard.json 0d948a1d52087d824ee1c1175d8e11f0dc11bab5 assets/immersiveweapons/models/item/wooden_spikes.json +390f1fd9cbabc46459d4372bf80ed8c5b03c1475 assets/immersiveweapons/models/item/wooden_tool_rod.json b3cfed076418fd4dd830ce8f1c861c23fec3c10d assets/immersiveweapons/models/item/yellow_stained_bulletproof_glass.json 0da8049e3f47fbb188e3740cda51d18b86fcd946 data/forge/tags/blocks/bulletproof_glass.json a7bffd9267089ddfe36ba70d024ff653d1650419 data/forge/tags/blocks/glass.json @@ -399,7 +399,7 @@ e9f68256eea7cebfe799b2a192f47fea74f9c267 data/forge/tags/items/stained_glass.jso 0c16958cb896e659855bd761486c87d875e77d0c data/immersiveweapons/advancements/bandage.json 069bfbdbcdd29cf491bad03d49f2c00f5d65bcfe data/immersiveweapons/advancements/battlefield.json 9f7000885c57bb7f897c9213b736c6f00782f484 data/immersiveweapons/advancements/biohazard_box.json -fe539ced5002824773d5498d6cdea940c9461060 data/immersiveweapons/advancements/blunderbuss.json +8fb003be5eda2976f67cbb45c579fbbd60ace2ec data/immersiveweapons/advancements/blunderbuss.json 19e7d295397efce685b9482ae3af45da7cd6d7f6 data/immersiveweapons/advancements/bottle_of_alcohol.json 7d5752a6fba5619b2ec52119033ebda729edcc75 data/immersiveweapons/advancements/celestial_lantern.json ef5c7dc387b5973c614846e1e5f1e341ad8a817b data/immersiveweapons/advancements/cloud.json @@ -432,9 +432,9 @@ d7b1bb507cb9160e65364ec0b86829138ce4ed7e data/immersiveweapons/advancements/disc b1120973063a26aade0ce229c66e281e4b3513d0 data/immersiveweapons/advancements/energized.json fa2adf89a4bf850e61b34ea9ff242e23407f93db data/immersiveweapons/advancements/entity_discovery.json c6d96e4714df6fe172a69d1f32149636f1ba3453 data/immersiveweapons/advancements/first_aid_kit.json -fba928596ba51d09cd2aadffacc1a5e2d695e40e data/immersiveweapons/advancements/flare_gun.json -07502a9d286a046f5110bdec3cd40f65ced4bae0 data/immersiveweapons/advancements/flintlock_pistol.json -62ead04deadb5148174a0330471a7fe2398aba23 data/immersiveweapons/advancements/gauntlet.json +8e51507a536245e77456d50648057e4643fad7af data/immersiveweapons/advancements/flare_gun.json +0c02afc4e18e81adab842f0c1021e27700576238 data/immersiveweapons/advancements/flintlock_pistol.json +7026ea710fcc0966076bc228584ea1f0cac300a2 data/immersiveweapons/advancements/gauntlet.json e13621ee7b0d10a8285305130484a886b9930b9e data/immersiveweapons/advancements/gold_ingot.json 383b04d9051d801fd8838862c80f086b483bfb5c data/immersiveweapons/advancements/ingots.json faafcf82bdadb1152e80a3481fd9c1da96eb45c7 data/immersiveweapons/advancements/lava_bath.json @@ -449,13 +449,13 @@ cadd6f5d70357e07efe49c8713abfc2b737c5fb8 data/immersiveweapons/advancements/medi e1ed57a33c785b78e97bd80c21a20ca6466dfbb9 data/immersiveweapons/advancements/molten_shovel.json 7dbfe98be8dae1f241da120b4d105ac1191730f9 data/immersiveweapons/advancements/molten_sword.json 1db6599ed3cd3853533c42c6e4194e2c0243c3a6 data/immersiveweapons/advancements/mud.json -09dca01b19deaf27f418a45159eb1b02fe6577fd data/immersiveweapons/advancements/musket.json -b6cbf49f276b95d22abe61ea77f3947aaddcd87a data/immersiveweapons/advancements/musket_ball.json +689dabeb4474502eb02c10b1fa7fed0760aeb42a data/immersiveweapons/advancements/musket.json +102c6af1b46b000e7adf84c1d00f76681c2aab10 data/immersiveweapons/advancements/musket_ball.json 813841587553adc9ed008f27fff7319b6fda8465 data/immersiveweapons/advancements/netherite_ingot.json 6dbcf0319629c2c7191b3620e12750b1931330cd data/immersiveweapons/advancements/netherite_projectile.json 4f1a4839b4806d4fbc93f1a15c522fcae666e201 data/immersiveweapons/advancements/nuggets.json 64e8fcaca83afe2b22678127cfbab3294b186008 data/immersiveweapons/advancements/obsidian_shard.json -1dab3d972cb3da5aa563415d4d7323c34c16c99e data/immersiveweapons/advancements/pike.json +0c5bf458119fc710d5af3c47c3f492141f67dc12 data/immersiveweapons/advancements/pike.json fb697f8055920153f614db5668bd1daa1e54320d data/immersiveweapons/advancements/planks.json b24e67192570f78f6a7e486ad879c8571b6d247b data/immersiveweapons/advancements/play_with_fire.json fb618e1122dd1b830eee51a449b5ca6246d0d53a data/immersiveweapons/advancements/pretty_windy.json @@ -568,11 +568,11 @@ e24d05528133aebb818773cd6228b73db314656a data/immersiveweapons/advancements/reci 88bba08cf4cdd19c7ca496ab04b73523a336f735 data/immersiveweapons/advancements/recipes/immersiveweapons/flare_gun.json 2dad6f7b7598e59e951f335d71072b1abd54d020 data/immersiveweapons/advancements/recipes/immersiveweapons/flintlock_pistol.json ef53cc978b2120f1e86473553be658de78ec1831 data/immersiveweapons/advancements/recipes/immersiveweapons/gadsden_flag.json -8ca2d577632fb95dde544cdfd6923f677794f1df data/immersiveweapons/advancements/recipes/immersiveweapons/gold_arrow.json -e551f3e40f17cbda2c9e98a9357ee0984275b93d data/immersiveweapons/advancements/recipes/immersiveweapons/gold_gauntlet.json -1005a876e5343014fc708ad810dc229e165710d1 data/immersiveweapons/advancements/recipes/immersiveweapons/gold_musket_ball.json -bf310e76e6b372ae2573854cdacee24e44378510 data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike.json -0e85c28aafc2f15f283486553ed9b9ea5bc69392 data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike_head.json +66e03260ebe9be287a90708be579c8809803c388 data/immersiveweapons/advancements/recipes/immersiveweapons/golden_arrow.json +3fce97f0f233839a0b181bba48d3f016f5345bc7 data/immersiveweapons/advancements/recipes/immersiveweapons/golden_gauntlet.json +da31b67c4034c89be42a7ac97bcb1ee5ba9b05be data/immersiveweapons/advancements/recipes/immersiveweapons/golden_musket_ball.json +a30e67010c7afcfbacfd83942128e89de98b936e data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike.json +ae8f53326bc7477d7198b03071deeff7bd033b17 data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike_head.json 4f5faf40ab56a287dbc3d2026a01c07a8b0a0530 data/immersiveweapons/advancements/recipes/immersiveweapons/gray_stained_bulletproof_glass.json 0c157a8fc810fcc4f28eee79b52b76ae3e150bcc data/immersiveweapons/advancements/recipes/immersiveweapons/green_stained_bulletproof_glass.json 3c444b5ca690f682d5aa5a9d50fc0cc25fad6169 data/immersiveweapons/advancements/recipes/immersiveweapons/hardened_mud_from_blasting_dried_mud.json @@ -632,7 +632,7 @@ c76a0657161b9bb7a05cc3520c0db1b7e01be34b data/immersiveweapons/advancements/reci 03d94e573b6ca8f19e256e3640d4daab363a639d data/immersiveweapons/advancements/recipes/immersiveweapons/panic_alarm.json c61a067cfe0ac6645b2cce7e1a32148a891cc6af data/immersiveweapons/advancements/recipes/immersiveweapons/pink_stained_bulletproof_glass.json e127c4655be4f713630279a7bd1c0667f093d2a1 data/immersiveweapons/advancements/recipes/immersiveweapons/pitfall.json -db16d3f2cdc951a5d4d48a24b4a159780dc61d5e data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json +cf1763115d85d2a21cd9a2108df86997a9a7197e data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json 46417525a83f155ec8b1039905aa837cd6a17702 data/immersiveweapons/advancements/recipes/immersiveweapons/punji_sticks.json d869e46a98d11c463830d4a1381be71a1926db94 data/immersiveweapons/advancements/recipes/immersiveweapons/purple_stained_bulletproof_glass.json 386a539e0153b522760efbdbfe074fc8afa58692 data/immersiveweapons/advancements/recipes/immersiveweapons/raw_cobalt.json @@ -642,18 +642,18 @@ e7f769329aaa16c1e019837714077f9279d3a09c data/immersiveweapons/advancements/reci ba5af41097abaee5410602a10411dcbdd74231fb data/immersiveweapons/advancements/recipes/immersiveweapons/sandbag.json beec09e911f52f1c3a7f7ab4a40cf2bb18bc7ea5 data/immersiveweapons/advancements/recipes/immersiveweapons/scope.json c51e2ce61fc3f1d856ba6efc76fd9c1bd1d19ccd data/immersiveweapons/advancements/recipes/immersiveweapons/small_parts_table.json -01327d614860084359a22f583ce66fe659c3e61f data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb.json -71306bc6be208ad7e3427370df49e03549d1e4f0 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow.json -c512bd4cafc35b0fe5659c40d69a39ace42b674a data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_blue.json -334c0dd7a1f164fcd5d6cd08b1e5472201b62aa7 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_green.json -950b6a5c3f6d45bba750c05012f6b98539d7dbd6 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_purple.json -f667a6a8be1878c7a12615c05591642db2fab86c data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_red.json -7f7461a48f3c1fd8fbe21fd2c27eaf04f9242fe9 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_yellow.json -00a30eb0a72b9f9961c1d177947e5d80b9ab1ebc data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_blue.json -c1ebb24b98e63028c80f1ccfbc9c1f3f7fffe3a1 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_green.json -cd65882c064da3161211f4af5feb3663c350131d data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_purple.json -1f17e5b395dec07b092c427e6f1feff88ec38d51 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_red.json -7fce77641a11c697cf5f83c646d1a1edab6619f4 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_yellow.json +d71ba046e6e7468abd8a418139ad14464029eb01 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade.json +783943e10d87047a916199887ba241ffb7641ea0 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow.json +38052e5f1df03ee50cd4d657486f2c14b8d29940 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_blue.json +5bc7c2f383b205c06d2f9d5a124620c61267e559 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_green.json +e187bc5e4ea5910c9c177db8dc1fc68e70dd5744 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_purple.json +ac54b421b99d8bc58bcc7345f7d3e965f1108584 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_red.json +2ea96b9c34b7b4c591393ccd0cf59184c456d231 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_yellow.json +a173de056645c19d404d5e04048b839f03bd96fa data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_blue.json +a6ad636b09b4647b17c47a5e2140045269dce7a6 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_green.json +a9903877074acda3c761acc08c099b59fc0bd999 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_purple.json +43524d9f41710489b97f2079d07a120080eddf59 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_red.json +5cc26437e5131640b95c384c9104aa4767cfac6c data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_yellow.json e8d77ef58c050240772dcad0f7b74309e96da4b9 data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_powder.json a1b1b7af85d719747c405eb78e1004013460705f data/immersiveweapons/advancements/recipes/immersiveweapons/spike_trap.json b304227837f5a55e310fe9ec9c3431ce9f214a04 data/immersiveweapons/advancements/recipes/immersiveweapons/spotlight.json @@ -697,22 +697,22 @@ d9d912d13e68077164848a4ac4910096883ae550 data/immersiveweapons/advancements/reci 5da0426fc1892353e7afd8ca86d70957b8feefa9 data/immersiveweapons/advancements/recipes/immersiveweapons/warrior_statue_head.json 9a12ab302063185f13c7d7b30c15024b195dc86b data/immersiveweapons/advancements/recipes/immersiveweapons/warrior_statue_torso.json 074878ad56c600adf2aa99c114b6e7ca2e55d6bc data/immersiveweapons/advancements/recipes/immersiveweapons/white_stained_bulletproof_glass.json -f26b98e688a095e0d658fee630f3f0baddf364fd data/immersiveweapons/advancements/recipes/immersiveweapons/wood_arrow.json -6a84ca28389b47963d7c3576dd4816a4a954ebbf data/immersiveweapons/advancements/recipes/immersiveweapons/wood_gauntlet.json -ce4ce92544c5e76fa56e6b597e1a5fa0c3be7e39 data/immersiveweapons/advancements/recipes/immersiveweapons/wood_musket_ball.json -9149cf0880bfc2dddb2e49a1e2a2600999684b45 data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike.json -6dd2f89d3d672971f213e2a4985f582f2fe22560 data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike_head.json -3cbcdb910fbb71d78f588da5f541295eb914c508 data/immersiveweapons/advancements/recipes/immersiveweapons/wood_tool_rod.json +26706c1df192608e64ff1a58e2e8a7f769eadbba data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_arrow.json +38ebf21edd70cf2cd03a980d6a155492fd8d072e data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_gauntlet.json +0080dfe60e23e400eb84fe203ac4db655c65f997 data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_musket_ball.json +ae3d4f60e37cb98e448f71b70372ec8621537583 data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike.json +d6dbd8d4d89a282a96c86b0491a3de27b2eca3f4 data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike_head.json 40306d61781fc28cbdbb28bff63eb092bd3f57e8 data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_spikes.json +5d0e46837d523f01b2056c7464235b9938690cbd data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_tool_rod.json 62f7715648f92684266f86e47c20856cfbdbf6e7 data/immersiveweapons/advancements/recipes/immersiveweapons/yellow_stained_bulletproof_glass.json 312b4c0a12a23ecb01b3e99e503c758a6784505a data/immersiveweapons/advancements/recipes/ingots_gold_tinkering.json 98d6c6bcfafa009363e995fa5d553679896a21fd data/immersiveweapons/advancements/recipes/ingots_iron_tinkering.json ec2c6127dda14ef2563b27a48c7abd832075c18a data/immersiveweapons/advancements/recipes/ingots_metal_tinkering.json 3b3e68f5768366ff8bae02a350bf3153054e4d17 data/immersiveweapons/advancements/recipes/planks_tinkering.json 111210cf74e3b2aefc3d43a60269a2fe1df02c6d data/immersiveweapons/advancements/root.json -9c24c439bbde0e9bccb83c71d2cd8312774684c5 data/immersiveweapons/advancements/shards.json -6e31bd205fcd9371fc1a35652b129300417abb0a data/immersiveweapons/advancements/small_partss_table.json -0922afa6aff06b7e5c891ada3b81b4a603d62598 data/immersiveweapons/advancements/smoke_bomb.json +75c42575bd31ed50f8c3d18ec249b323a9c047b5 data/immersiveweapons/advancements/shards.json +6e31bd205fcd9371fc1a35652b129300417abb0a data/immersiveweapons/advancements/small_parts_table.json +81a15e182e3fdd1de0778683b48f1ee6afe44ff4 data/immersiveweapons/advancements/smoke_grenade.json 7573e90f1a26a3b549bf13350f5669e77dbd11b4 data/immersiveweapons/advancements/stone_shard.json 6a94bd6d0acb704a6d92e9561a787f1c268f1c58 data/immersiveweapons/advancements/tesla_axe.json 3cc127d4b018cba7bdf2177a039d925ed073b450 data/immersiveweapons/advancements/tesla_coil.json @@ -723,7 +723,7 @@ fafd45ff9e188b07c6d171f2fe15007a6ae2e001 data/immersiveweapons/advancements/tesl b4af3558485cea031a8265fa308681e8735f4991 data/immersiveweapons/advancements/tesla_sword.json 3edcd8f36edfa52103950028066eb805e450ab79 data/immersiveweapons/advancements/tesla_synthesizer.json 5bd70b7e5ea8ed6da7dbc1dab5a5a8a0b5c1fd81 data/immersiveweapons/advancements/tiltros.json -169624368a63efa5be29ede8106edd82189cf322 data/immersiveweapons/advancements/tool_rod.json +2eaa78498288d97125500ba180e38a6d937c0117 data/immersiveweapons/advancements/tool_rod.json 518110556eb5ff5771007b0a3f8c44c95e8bc3d3 data/immersiveweapons/advancements/traps.json ecdf98e9cce18a5c1fae211ac7b0c3204b633a3a data/immersiveweapons/advancements/used_syringe.json 06caed24978597084a272de95c5dfeb651deebc9 data/immersiveweapons/advancements/ventus_axe.json @@ -736,7 +736,7 @@ d4876ace60fe5d0420ceb0056326ad3756ac0040 data/immersiveweapons/advancements/vent 3710964e26a22c7cd797803a1e384f500c7a6bf9 data/immersiveweapons/advancements/ventus_sword.json 2a3755764a698e576a63024c32f6d7c67e9b1b86 data/immersiveweapons/advancements/warm_and_toasty.json 5730b7a7706deb2263fb64402320423dccb29f92 data/immersiveweapons/advancements/warrior_statue.json -47a87dc9991757e91e591355f1482268f7abba69 data/immersiveweapons/advancements/wood_shard.json +e332d9ee7645066c0d5cce4d4497676fcb89c5be data/immersiveweapons/advancements/wooden_shard.json 00bf6a92d13bf35b58c7e882914fcfa88557668b data/immersiveweapons/loot_tables/blocks/acacia_table.json 2d7f391b4bc350415857eee1218509f9c8f3eee7 data/immersiveweapons/loot_tables/blocks/american_flag.json a6c337c02e1d100738df89268fc3196177ce8496 data/immersiveweapons/loot_tables/blocks/barbed_wire.json @@ -900,7 +900,7 @@ b766969e3e699baace916cf64d45f458aa2fad06 data/immersiveweapons/recipes/cobalt_in 0d6692fa8fbb0a9d073de3a382e4b20ca6f13315 data/immersiveweapons/recipes/cobalt_musket_ball.json 8505ad8afba18bd2bdb397c5763a81b332efa282 data/immersiveweapons/recipes/cobalt_nugget.json e9111cb18edca2b1296cb3e2fcab8c4a18a66b23 data/immersiveweapons/recipes/cobalt_pickaxe.json -6ac154814f9eb5f8c0182c42ddbd3c7ccf386eb5 data/immersiveweapons/recipes/cobalt_pike.json +fc4b22d09fe43170734a6cc9081d1155f12077d6 data/immersiveweapons/recipes/cobalt_pike.json 672e5850b96edd9f9c1ed11e84a9e4c539df0274 data/immersiveweapons/recipes/cobalt_pike_head.json 2c39d124570efc219f721fe53cbbfdf1c1ae1dbe data/immersiveweapons/recipes/cobalt_shovel.json 3c10b3d7b13934f7b86b9cc25c466e6cfb28a22e data/immersiveweapons/recipes/cobalt_sword.json @@ -916,7 +916,7 @@ fce4415f186be8792e12c037b9bc9486bd3c7688 data/immersiveweapons/recipes/copper_bo a94e69d5dd1996dc7370b78142d7582df9b999c1 data/immersiveweapons/recipes/copper_musket_ball.json 658886da53daf89eb000d00f5af1336a9538cc74 data/immersiveweapons/recipes/copper_nugget.json ae09671a808eebfba779f23c460dbef0ffb0284e data/immersiveweapons/recipes/copper_pickaxe.json -60ef6e35db7af84b65a84b8654285e763794a16a data/immersiveweapons/recipes/copper_pike.json +d3317aa2670a3b5dbb6f441b413f05bd87762a5f data/immersiveweapons/recipes/copper_pike.json 09efdd4eb66aefdedbcf46cbc83e858140be702a data/immersiveweapons/recipes/copper_pike_head.json ba2a426d303f437cfcfb0eb9372d4332e6cd1bd4 data/immersiveweapons/recipes/copper_shovel.json 696ee398c47ee03fdf8f9c4a2437cdd2dc9c3bd4 data/immersiveweapons/recipes/copper_sword.json @@ -932,7 +932,7 @@ e99dd60ec7511496de822e1489bc8f3cf9f487ae data/immersiveweapons/recipes/corrugate e7865107344f278ca807b91f3067d0e57168fe9a data/immersiveweapons/recipes/diamond_arrow.json b2c9bde0474a3cc9f600bf414843f64050ca2537 data/immersiveweapons/recipes/diamond_gauntlet.json fef3288cc2b10c55744ec8e2a603107cd453d98b data/immersiveweapons/recipes/diamond_musket_ball.json -58db731f8337746483f11fbede3a13e8e03c2aaf data/immersiveweapons/recipes/diamond_pike.json +f948e6d5a729f54e08092bf39d779b1f0799bd20 data/immersiveweapons/recipes/diamond_pike.json 40d42af1f1292b6bd8336678256c645ae119fe13 data/immersiveweapons/recipes/diamond_pike_head.json a7af626b3d330fbbb4cf02df9c2c83777c705a40 data/immersiveweapons/recipes/diamond_shard.json 40129e1b78a8a22c3664b0d5f2349702754b2af3 data/immersiveweapons/recipes/dried_mud_from_blasting_mud.json @@ -948,11 +948,11 @@ e76298e342b76aae0c8ff5a5112a870c6e73042c data/immersiveweapons/recipes/first_aid cd35a6667e39b22ca0bae8e94eb3ae6a32a70b49 data/immersiveweapons/recipes/flare_gun.json 629c01fd2803472785f7d5b4308ea6ce22c753fd data/immersiveweapons/recipes/flintlock_pistol.json f0e36749433ddd475bb72f57ab2d757370ede665 data/immersiveweapons/recipes/gadsden_flag.json -03d0a371e19e2d3caa670250299603ace5a0546d data/immersiveweapons/recipes/gold_arrow.json -6b497bed0e1a112bec174824d19d4e48582342ad data/immersiveweapons/recipes/gold_gauntlet.json -a69de0f4c9f4185cae39cef3f4972aeae7c6393b data/immersiveweapons/recipes/gold_musket_ball.json -c5560c495301025d68df8e7ec7c54396d9b5f275 data/immersiveweapons/recipes/gold_pike.json -4570d1b5760f887fedd4098d234a9c9fc34f3ea7 data/immersiveweapons/recipes/gold_pike_head.json +73fd22e25cfd2e70f7aab751208bd40f5134ab66 data/immersiveweapons/recipes/golden_arrow.json +32938cd7474b35379be7f97d2ffa033d965f39b6 data/immersiveweapons/recipes/golden_gauntlet.json +ce2b6c2e0315679aabcb3b10898f12b2139178c2 data/immersiveweapons/recipes/golden_musket_ball.json +dced695143b6e226a59185d60f2e5439cc2a19ba data/immersiveweapons/recipes/golden_pike.json +75af60b1f5099f2c19cb15b63724d904dd440b13 data/immersiveweapons/recipes/golden_pike_head.json d031c7b43e0e77e901decc10f569a97c9ac659ef data/immersiveweapons/recipes/gray_stained_bulletproof_glass.json 58df151bd03700e7c9ebc1366f0b369eb87a3d19 data/immersiveweapons/recipes/green_stained_bulletproof_glass.json f7902a3916d91c2012f01519e9fa779d25b2a603 data/immersiveweapons/recipes/hardened_mud_from_blasting_dried_mud.json @@ -965,11 +965,11 @@ ec8c35dc91d55bb2938d28a314e3cdfd4db878e0 data/immersiveweapons/recipes/hardened_ b5fa403c0bdde45d7ea9229cccdcad7b634ef983 data/immersiveweapons/recipes/immersive_weapons_flag.json 6a83b71e360cde99198a37863f594396d08e8546 data/immersiveweapons/recipes/ingots_gold_tinkering.json dac488a1561f8b8e20974638aea0d0349ddb7ce7 data/immersiveweapons/recipes/ingots_iron_tinkering.json -1fe2a1db4da4416e889b913f49b769106fef2eca data/immersiveweapons/recipes/ingots_metal_tinkering.json +ea051d9df97882f760bcd6db42990e7302338eed data/immersiveweapons/recipes/ingots_metal_tinkering.json 9d2ad961d6db47a799eec4b9478e5c3fa78f48d5 data/immersiveweapons/recipes/iron_arrow.json 6c43242818ee7476da7431adc79223b73ca94df4 data/immersiveweapons/recipes/iron_gauntlet.json d236c9cb5bd0c97dc5d68d0e39ff98b28aae2b91 data/immersiveweapons/recipes/iron_musket_ball.json -117a1dd2c8a2ecc8c923f2c526f034bd5888ecb8 data/immersiveweapons/recipes/iron_pike.json +6e978a50f28354a329e8b5ee203e4d94edfca83f data/immersiveweapons/recipes/iron_pike.json a7fcb73cbbe1ad7f635e965f92db6ef62d425513 data/immersiveweapons/recipes/iron_pike_head.json ff7feed429bb112162e43f6c5e192a6e973340c6 data/immersiveweapons/recipes/jungle_table.json 967ad75d33c882975df78197d10c59ccb3126b78 data/immersiveweapons/recipes/landmine.json @@ -1016,7 +1016,7 @@ c459ebae671a620c8a019c4baa0d145c1a252453 data/immersiveweapons/recipes/painkille 8cf8de3eb47679aac0295dbb443f2c2f90a287b8 data/immersiveweapons/recipes/pink_stained_bulletproof_glass.json ee8ca4e2e8866d530b63a7552b8ebdb7858c035b data/immersiveweapons/recipes/pitfall.json 9c8b1040fc204ea736a8904f5bebefcc8d8b7476 data/immersiveweapons/recipes/planks_tinkering.json -2c15b0a3b16fa8c9724dbbed10bb240a5cc3aae0 data/immersiveweapons/recipes/pliers.json +fb8c7f97def9d94b4494802cc98d9db9f51f48d3 data/immersiveweapons/recipes/pliers.json b887d09bb4920eef83e809015bdef951fa180224 data/immersiveweapons/recipes/punji_sticks.json 809e629cc9c3e1c6e0a82ea97ffede6e08d33276 data/immersiveweapons/recipes/purple_stained_bulletproof_glass.json a79d920cd483ae8e6f05aa2350f91736a8930f29 data/immersiveweapons/recipes/raw_cobalt.json @@ -1026,26 +1026,26 @@ a79d920cd483ae8e6f05aa2350f91736a8930f29 data/immersiveweapons/recipes/raw_cobal 341b05bd5aed88553f0b02e8d472386f92b27fb6 data/immersiveweapons/recipes/sandbag.json 12d2aeb7f789091cc94a298e93bf250fafe8bf0c data/immersiveweapons/recipes/scope.json dcd4050787b46f87b3dcccebdbce56710f96d61c data/immersiveweapons/recipes/small_parts_table.json -9f4d659ef18a41d00fb4e5cb5e8626290f8c7a66 data/immersiveweapons/recipes/smoke_bomb.json -2a247a42b880b693390984afd8e193f1aa0d1bc0 data/immersiveweapons/recipes/smoke_bomb_arrow.json -3dadf09a8b44ebdd9288112d74aed0b4ee91ea10 data/immersiveweapons/recipes/smoke_bomb_arrow_blue.json -ef2e71e017ebe0157033c99e1a0993a4533142f9 data/immersiveweapons/recipes/smoke_bomb_arrow_green.json -3277282a4cc87e7fe67d4bc1965b00f812873ed2 data/immersiveweapons/recipes/smoke_bomb_arrow_purple.json -8eb0e5248f4b337b56e62ef3ad5abba2cee5c28a data/immersiveweapons/recipes/smoke_bomb_arrow_red.json -3c486a859ed722d9b1718c64b53de7b0c0198f3c data/immersiveweapons/recipes/smoke_bomb_arrow_yellow.json -c6520868c15b357b880510849c20ae548a5a2031 data/immersiveweapons/recipes/smoke_bomb_blue.json -67dd8083dfdcd66a14649d0084051cc2f9db3cb4 data/immersiveweapons/recipes/smoke_bomb_green.json -e06012ac4ac95bfb542bdc5acfe457d1bec044a0 data/immersiveweapons/recipes/smoke_bomb_purple.json -7fe62e919c8a0e6848197172dbc9425f61212119 data/immersiveweapons/recipes/smoke_bomb_red.json -f853d0cb1c3552d9ad1bcac519b50a134e996d84 data/immersiveweapons/recipes/smoke_bomb_yellow.json -e0e7e7159f9550dccd68748256e7fdc6ef77f6f8 data/immersiveweapons/recipes/smoke_powder.json +790601d279989422a3c9f47e7348a589424fd7fa data/immersiveweapons/recipes/smoke_grenade.json +73aca2e6a1a173c1ff11af2e919b72f41965d8df data/immersiveweapons/recipes/smoke_grenade_arrow.json +b85bc825605c52d153f9fe0e03bceb5317f05264 data/immersiveweapons/recipes/smoke_grenade_arrow_blue.json +511a4c066585422ce5637f0894b9743f5f5e97b7 data/immersiveweapons/recipes/smoke_grenade_arrow_green.json +6e80e5f982c3b66ea8aa6c237eca72e6c07acca9 data/immersiveweapons/recipes/smoke_grenade_arrow_purple.json +97034b8fafb2a5a9a5614a446bb3025d1e1ce2ac data/immersiveweapons/recipes/smoke_grenade_arrow_red.json +e6b77bb760bde02477ba75b942d477b265c51df9 data/immersiveweapons/recipes/smoke_grenade_arrow_yellow.json +f8f9f300fb44f29fdf33799d6b73ce49357c2be1 data/immersiveweapons/recipes/smoke_grenade_blue.json +3ffec5347cfcca0a089d00e2d851d214321be65d data/immersiveweapons/recipes/smoke_grenade_green.json +4da8de2bdf7dbc1d0a84cf15d81d953539aeb859 data/immersiveweapons/recipes/smoke_grenade_purple.json +9e544c4334d84b5aa4db4a380b50f4ca7134c5bb data/immersiveweapons/recipes/smoke_grenade_red.json +c26a470993588324cc99aa233f32c46877240212 data/immersiveweapons/recipes/smoke_grenade_yellow.json +211e67f301d69da59660f7a3aaa016c603958d88 data/immersiveweapons/recipes/smoke_powder.json e6e43ea5c2c27048f5a502cd71df79f1ad014076 data/immersiveweapons/recipes/spike_trap.json 4cbfa1dfedd4015711ee599df696285432e82e1d data/immersiveweapons/recipes/spotlight.json 18cd4657adc893b121bef969ed64254acc4d78db data/immersiveweapons/recipes/spruce_table.json 1a1f3581d382c5ebe1c5ed54047840c3c6bae55d data/immersiveweapons/recipes/stone_arrow.json 92b4eb10002d66a6afab6515cd7ca6cb62059f63 data/immersiveweapons/recipes/stone_gauntlet.json 402ef92540d4cb89d8c0776b590cdbd1048b66f1 data/immersiveweapons/recipes/stone_musket_ball.json -ae75b9fde4ee18b320446d9a4457bc134f1217d6 data/immersiveweapons/recipes/stone_pike.json +be29c4a7516385d105ac10268ac6b430f21189ab data/immersiveweapons/recipes/stone_pike.json ef909e395a6c28ab1787da1d8b830a6ee222efbd data/immersiveweapons/recipes/stone_pike_head.json 85b2742541047963b7c12e157af9692b13f4eea1 data/immersiveweapons/recipes/stone_shard.json cf1038781c6d12931c09570de55a363dc73257cb data/immersiveweapons/recipes/sulfur.json @@ -1081,13 +1081,13 @@ d73f5f4a30a8d5485c1af3a4b911d61fc91c6403 data/immersiveweapons/recipes/warrior_s d6d9a0ab9a1e5cbcd5c8dcffdade62c9eaf69e34 data/immersiveweapons/recipes/warrior_statue_head.json ae30c5e16bd8442bff692b6120c5bed930dfd3d4 data/immersiveweapons/recipes/warrior_statue_torso.json 4627fa46015d30e4bef15ed744578ec3d61f0c6c data/immersiveweapons/recipes/white_stained_bulletproof_glass.json -c6e119bb0791d87087f735ce2eff9eb1d07e99a9 data/immersiveweapons/recipes/wood_arrow.json -0f0cf66db1d60d3333311f88e91d591c501a19dd data/immersiveweapons/recipes/wood_gauntlet.json -fd21abfcfb690de6a16db83ea3aa50c8cfc8556b data/immersiveweapons/recipes/wood_musket_ball.json -c3e480e18c80c7daad1a6180c12abaeec2a105b9 data/immersiveweapons/recipes/wood_pike.json -3610fae9533ef5cce9292a785b0953bf9de10129 data/immersiveweapons/recipes/wood_pike_head.json -4a9ea559608b35e7eb76e1b894bf962429cdff9f data/immersiveweapons/recipes/wood_tool_rod.json +e26eb148399a8c5d54abe6df7e4a14eb5ce39cb3 data/immersiveweapons/recipes/wooden_arrow.json +4fb8fa94a5780d47aeeb7ff1f9b504bea96a9894 data/immersiveweapons/recipes/wooden_gauntlet.json +e1f10c5c656d0fa17bdfda956715053db525e317 data/immersiveweapons/recipes/wooden_musket_ball.json +5a524f0698521c0c213ef4455b226d45d6f7f4a3 data/immersiveweapons/recipes/wooden_pike.json +a41131e6bb922210930564c351962b4f543118cf data/immersiveweapons/recipes/wooden_pike_head.json 78f52295018c54146f5cc79310a411dc70229b7a data/immersiveweapons/recipes/wooden_spikes.json +07be84ce51c8a1d48929680d1fc3a66776cd6add data/immersiveweapons/recipes/wooden_tool_rod.json 3da20f7d4b4921da0f51149764dda0342c10cb99 data/immersiveweapons/recipes/yellow_stained_bulletproof_glass.json 368764e9e8071817eddc8912a49c1b600fc5e761 data/immersiveweapons/tags/blocks/burned_oak_logs.json 368764e9e8071817eddc8912a49c1b600fc5e761 data/immersiveweapons/tags/items/burned_oak_logs.json @@ -1095,12 +1095,12 @@ d02cc620c31dcb3d2409446e314ca1f2cbbf2a7b data/immersiveweapons/tags/items/ingots 771b910bc0ffba0ae37ff70e42d9e37666cc7db7 data/immersiveweapons/tags/items/ingots/molten.json ce6a439f5218f0d986eae08079ab065c43849b4f data/immersiveweapons/tags/items/ingots/tesla.json 6b7a2288b6eb44d670653d4e7922571e8bcff9cc data/immersiveweapons/tags/items/projectiles/flares.json -7008753d22c524d0ad52e5dd0ed74e4e385f04c6 data/immersiveweapons/tags/items/projectiles/musket_balls.json +dbd68812848f34a0f83c62e8d244aad49bf7d8cd data/immersiveweapons/tags/items/projectiles/musket_balls.json 255b5c9ebecfc71314eca51e916b9754dd28e275 data/immersiveweapons/tags/items/shards/diamond.json 35dde332d4552f17b9371ea381c19314e1873da8 data/immersiveweapons/tags/items/shards/molten.json 6d77011fb8a4045c9ddf3688c843176b546588be data/immersiveweapons/tags/items/shards/stone.json 6fb989e362e1eafadf5f7732112cf2fe1f2d8d8b data/immersiveweapons/tags/items/shards/ventus.json -c623b6e951eb3860b531efd062af5eb2bb9a43d7 data/immersiveweapons/tags/items/shards/wood.json +dc4aa02f05ef0ebb335e1562622d6c6a272f99a0 data/immersiveweapons/tags/items/shards/wood.json bb4a9463fae39c80214255ebf1986f8693265327 data/immersiveweapons/tags/worldgen/biome/has_structure/abandoned_factory.json c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/battlefield_camp.json c13e115e0d989d69f270247d661523241d3ffeb2 data/immersiveweapons/tags/worldgen/biome/has_structure/battlefield_town.json @@ -1137,7 +1137,7 @@ d7c69ce769a493a8663134294155f8fd6701bc51 data/minecraft/tags/blocks/wooden_press 6a88027efebfbbbff0e3b274082e6f54a6854a2a data/minecraft/tags/blocks/wooden_slabs.json 7831de70f0d371abb450972ba7486cb288f91909 data/minecraft/tags/blocks/wooden_stairs.json 7c500f48a2925f8dcac78bdc93e766d095880b46 data/minecraft/tags/blocks/wooden_trapdoors.json -61e0beedb6b9440aa8886bada714051d8882a2ae data/minecraft/tags/items/arrows.json +1861ba2b32859d21bfc6f7b6f9dd71826c6ae4b0 data/minecraft/tags/items/arrows.json 050bbc55d566d29638babaeffca5ce2438e9b083 data/minecraft/tags/items/boats.json 4a45573a35d3979a08a43e699a64fbda69d0332a data/minecraft/tags/items/fences.json 344451d32c25e8e05447677bbe26cdb43b115138 data/minecraft/tags/items/logs_that_burn.json diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_shard.json b/src/generated/resources/assets/immersiveweapons/models/item/golden_arrow.json similarity index 55% rename from src/generated/resources/assets/immersiveweapons/models/item/wood_shard.json rename to src/generated/resources/assets/immersiveweapons/models/item/golden_arrow.json index cedcc9d1c..3f97517e3 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/wood_shard.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/golden_arrow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/wood_shard" + "layer0": "immersiveweapons:item/golden_arrow" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json b/src/generated/resources/assets/immersiveweapons/models/item/golden_pike_head.json similarity index 53% rename from src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json rename to src/generated/resources/assets/immersiveweapons/models/item/golden_pike_head.json index ee84d3a06..2e92dc479 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/golden_pike_head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow" + "layer0": "immersiveweapons:item/golden_pike_head" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/grenade_assembly.json b/src/generated/resources/assets/immersiveweapons/models/item/grenade_assembly.json new file mode 100644 index 000000000..e36ce7544 --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/grenade_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/grenade_assembly" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json b/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json deleted file mode 100644 index c718d8ccb..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/small_parts_metal_throwable_bomb" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json deleted file mode 100644 index a0068dfdc..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow_blue" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json deleted file mode 100644 index 10ad42dbd..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow_green" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json deleted file mode 100644 index 030cc2d4f..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow_purple" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json deleted file mode 100644 index a5c36c423..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow_red" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json deleted file mode 100644 index 2849e9007..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/smoke_bomb_arrow_yellow" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow.json new file mode 100644 index 000000000..59eac57fc --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/smoke_grenade_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json new file mode 100644 index 000000000..81debc5fa --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/smoke_grenade_arrow_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json new file mode 100644 index 000000000..9aa8f7b65 --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/smoke_grenade_arrow_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json new file mode 100644 index 000000000..00a8e1d54 --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/smoke_grenade_arrow_purple" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json similarity index 50% rename from src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json rename to src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json index c4400e88c..b8a311d29 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/small_parts_metal_tool" + "layer0": "immersiveweapons:item/smoke_grenade_arrow_red" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json new file mode 100644 index 000000000..84a691d96 --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/smoke_grenade_arrow_yellow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/gold_arrow.json b/src/generated/resources/assets/immersiveweapons/models/item/tool_joint.json similarity index 56% rename from src/generated/resources/assets/immersiveweapons/models/item/gold_arrow.json rename to src/generated/resources/assets/immersiveweapons/models/item/tool_joint.json index 59c05b3f5..d3d732a58 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/gold_arrow.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/tool_joint.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/gold_arrow" + "layer0": "immersiveweapons:item/tool_joint" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json b/src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json deleted file mode 100644 index af68f3fc8..000000000 --- a/src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "immersiveweapons:item/wood_pike_head" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_arrow.json b/src/generated/resources/assets/immersiveweapons/models/item/wooden_arrow.json similarity index 55% rename from src/generated/resources/assets/immersiveweapons/models/item/wood_arrow.json rename to src/generated/resources/assets/immersiveweapons/models/item/wooden_arrow.json index f56bfe3e8..a45fb6672 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/wood_arrow.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/wooden_arrow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/wood_arrow" + "layer0": "immersiveweapons:item/wooden_arrow" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wooden_pike_head.json b/src/generated/resources/assets/immersiveweapons/models/item/wooden_pike_head.json new file mode 100644 index 000000000..746f304d2 --- /dev/null +++ b/src/generated/resources/assets/immersiveweapons/models/item/wooden_pike_head.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immersiveweapons:item/wooden_pike_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_tool_rod.json b/src/generated/resources/assets/immersiveweapons/models/item/wooden_shard.json similarity index 54% rename from src/generated/resources/assets/immersiveweapons/models/item/wood_tool_rod.json rename to src/generated/resources/assets/immersiveweapons/models/item/wooden_shard.json index b94f26e23..36f3d55ec 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/wood_tool_rod.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/wooden_shard.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/wood_tool_rod" + "layer0": "immersiveweapons:item/wooden_shard" } } \ No newline at end of file diff --git a/src/generated/resources/assets/immersiveweapons/models/item/gold_pike_head.json b/src/generated/resources/assets/immersiveweapons/models/item/wooden_tool_rod.json similarity index 53% rename from src/generated/resources/assets/immersiveweapons/models/item/gold_pike_head.json rename to src/generated/resources/assets/immersiveweapons/models/item/wooden_tool_rod.json index f8a172c0e..4d1a20b33 100644 --- a/src/generated/resources/assets/immersiveweapons/models/item/gold_pike_head.json +++ b/src/generated/resources/assets/immersiveweapons/models/item/wooden_tool_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "immersiveweapons:item/gold_pike_head" + "layer0": "immersiveweapons:item/wooden_tool_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/blunderbuss.json b/src/generated/resources/data/immersiveweapons/advancements/blunderbuss.json index 0b149d1e7..e46e31e47 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/blunderbuss.json +++ b/src/generated/resources/data/immersiveweapons/advancements/blunderbuss.json @@ -1,5 +1,5 @@ { - "parent": "immersiveweapons:small_partss_table", + "parent": "immersiveweapons:small_parts_table", "display": { "icon": { "item": "immersiveweapons:blunderbuss", diff --git a/src/generated/resources/data/immersiveweapons/advancements/flare_gun.json b/src/generated/resources/data/immersiveweapons/advancements/flare_gun.json index ab52a5937..06fe6ad87 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/flare_gun.json +++ b/src/generated/resources/data/immersiveweapons/advancements/flare_gun.json @@ -1,5 +1,5 @@ { - "parent": "immersiveweapons:small_partss_table", + "parent": "immersiveweapons:small_parts_table", "display": { "icon": { "item": "immersiveweapons:flare_gun", diff --git a/src/generated/resources/data/immersiveweapons/advancements/flintlock_pistol.json b/src/generated/resources/data/immersiveweapons/advancements/flintlock_pistol.json index 07964f384..b9017c59b 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/flintlock_pistol.json +++ b/src/generated/resources/data/immersiveweapons/advancements/flintlock_pistol.json @@ -1,5 +1,5 @@ { - "parent": "immersiveweapons:small_partss_table", + "parent": "immersiveweapons:small_parts_table", "display": { "icon": { "item": "immersiveweapons:flintlock_pistol", diff --git a/src/generated/resources/data/immersiveweapons/advancements/gauntlet.json b/src/generated/resources/data/immersiveweapons/advancements/gauntlet.json index ecfc54b98..c0662c51f 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/gauntlet.json +++ b/src/generated/resources/data/immersiveweapons/advancements/gauntlet.json @@ -23,7 +23,7 @@ "items": [ { "items": [ - "immersiveweapons:wood_gauntlet" + "immersiveweapons:wooden_gauntlet" ] } ] @@ -47,7 +47,7 @@ "items": [ { "items": [ - "immersiveweapons:gold_gauntlet" + "immersiveweapons:golden_gauntlet" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/musket.json b/src/generated/resources/data/immersiveweapons/advancements/musket.json index b1df643ea..aa50ca846 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/musket.json +++ b/src/generated/resources/data/immersiveweapons/advancements/musket.json @@ -1,5 +1,5 @@ { - "parent": "immersiveweapons:small_partss_table", + "parent": "immersiveweapons:small_parts_table", "display": { "icon": { "item": "immersiveweapons:musket", diff --git a/src/generated/resources/data/immersiveweapons/advancements/musket_ball.json b/src/generated/resources/data/immersiveweapons/advancements/musket_ball.json index 7fc8e1068..d8ee5747d 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/musket_ball.json +++ b/src/generated/resources/data/immersiveweapons/advancements/musket_ball.json @@ -2,7 +2,7 @@ "parent": "immersiveweapons:root", "display": { "icon": { - "item": "immersiveweapons:gold_musket_ball" + "item": "immersiveweapons:golden_musket_ball" }, "title": { "translate": "advancements.immersiveweapons.musket_ball.title" diff --git a/src/generated/resources/data/immersiveweapons/advancements/pike.json b/src/generated/resources/data/immersiveweapons/advancements/pike.json index 4da3ca55a..a44e8272a 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/pike.json +++ b/src/generated/resources/data/immersiveweapons/advancements/pike.json @@ -23,7 +23,7 @@ "items": [ { "items": [ - "immersiveweapons:wood_pike" + "immersiveweapons:wooden_pike" ] } ] @@ -71,7 +71,7 @@ "items": [ { "items": [ - "immersiveweapons:gold_pike" + "immersiveweapons:golden_pike" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_arrow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_arrow.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_arrow.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_arrow.json index 5f0c60cae..2c63717f8 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_arrow.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_arrow.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:gold_arrow" + "immersiveweapons:golden_arrow" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:gold_arrow" + "recipe": "immersiveweapons:golden_arrow" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_gauntlet.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_gauntlet.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_gauntlet.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_gauntlet.json index 0568529b1..f80d0c139 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_gauntlet.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_gauntlet.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:gold_gauntlet" + "immersiveweapons:golden_gauntlet" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:gold_gauntlet" + "recipe": "immersiveweapons:golden_gauntlet" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_musket_ball.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_musket_ball.json similarity index 82% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_musket_ball.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_musket_ball.json index b5d7e9a0b..a827cfab4 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_musket_ball.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_musket_ball.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:gold_musket_ball" + "immersiveweapons:golden_musket_ball" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:gold_musket_ball" + "recipe": "immersiveweapons:golden_musket_ball" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike.json index c6143f0cd..a05568998 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:gold_pike" + "immersiveweapons:golden_pike" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:gold_pike" + "recipe": "immersiveweapons:golden_pike" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike_head.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike_head.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike_head.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike_head.json index 3aedc3110..0d0cb2a3f 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike_head.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike_head.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:gold_pike_head" + "immersiveweapons:golden_pike_head" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:gold_pike_head" + "recipe": "immersiveweapons:golden_pike_head" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json index f35a59600..f910f3ddc 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "immersiveweapons:small_parts_metal_tool" + "immersiveweapons:tool_joint" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_purple.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_purple.json deleted file mode 100644 index 3212cc5d3..000000000 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_purple.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "immersiveweapons:smoke_bomb_arrow_purple" - ] - }, - "criteria": { - "smoke_powder": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "immersiveweapons:smoke_powder" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow_purple" - } - } - }, - "requirements": [ - [ - "smoke_powder", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_yellow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_yellow.json deleted file mode 100644 index 6a2bbb31d..000000000 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_yellow.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "immersiveweapons:smoke_bomb_arrow_yellow" - ] - }, - "criteria": { - "smoke_powder": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "immersiveweapons:smoke_powder" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow_yellow" - } - } - }, - "requirements": [ - [ - "smoke_powder", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_purple.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_purple.json deleted file mode 100644 index ac36a780c..000000000 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_purple.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "immersiveweapons:smoke_bomb_purple" - ] - }, - "criteria": { - "smoke_powder": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "immersiveweapons:smoke_powder" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "immersiveweapons:smoke_bomb_purple" - } - } - }, - "requirements": [ - [ - "smoke_powder", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_red.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_red.json deleted file mode 100644 index 02e530c76..000000000 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_red.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "immersiveweapons:smoke_bomb_red" - ] - }, - "criteria": { - "smoke_powder": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "immersiveweapons:smoke_powder" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "immersiveweapons:smoke_bomb_red" - } - } - }, - "requirements": [ - [ - "smoke_powder", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_yellow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_yellow.json deleted file mode 100644 index c0b4c7c78..000000000 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_yellow.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "immersiveweapons:smoke_bomb_yellow" - ] - }, - "criteria": { - "smoke_powder": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "immersiveweapons:smoke_powder" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "immersiveweapons:smoke_bomb_yellow" - } - } - }, - "requirements": [ - [ - "smoke_powder", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade.json similarity index 85% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade.json index 480421419..8a2b96716 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb" + "immersiveweapons:smoke_grenade" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb" + "recipe": "immersiveweapons:smoke_grenade" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_green.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_green.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow.json index 1ed4e176b..b86fd590f 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_green.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_green" + "immersiveweapons:smoke_grenade_arrow" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_green" + "recipe": "immersiveweapons:smoke_grenade_arrow" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_green.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_blue.json similarity index 82% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_green.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_blue.json index 35d956504..f1151e5cf 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_green.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_blue.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_arrow_green" + "immersiveweapons:smoke_grenade_arrow_blue" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow_green" + "recipe": "immersiveweapons:smoke_grenade_arrow_blue" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_green.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_green.json new file mode 100644 index 000000000..84dbada96 --- /dev/null +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_green.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "immersiveweapons:smoke_grenade_arrow_green" + ] + }, + "criteria": { + "smoke_powder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "immersiveweapons:smoke_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "immersiveweapons:smoke_grenade_arrow_green" + } + } + }, + "requirements": [ + [ + "smoke_powder", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_purple.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_purple.json new file mode 100644 index 000000000..1afc52388 --- /dev/null +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_purple.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "immersiveweapons:smoke_grenade_arrow_purple" + ] + }, + "criteria": { + "smoke_powder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "immersiveweapons:smoke_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "immersiveweapons:smoke_grenade_arrow_purple" + } + } + }, + "requirements": [ + [ + "smoke_powder", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_blue.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_red.json similarity index 82% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_blue.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_red.json index 7610681df..6bd362ade 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_blue.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_red.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_arrow_blue" + "immersiveweapons:smoke_grenade_arrow_red" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow_blue" + "recipe": "immersiveweapons:smoke_grenade_arrow_red" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_yellow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_yellow.json new file mode 100644 index 000000000..3d2830139 --- /dev/null +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_arrow_yellow.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "immersiveweapons:smoke_grenade_arrow_yellow" + ] + }, + "criteria": { + "smoke_powder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "immersiveweapons:smoke_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "immersiveweapons:smoke_grenade_arrow_yellow" + } + } + }, + "requirements": [ + [ + "smoke_powder", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_blue.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_blue.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_blue.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_blue.json index 8fcf9781e..0230274b0 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_blue.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_blue.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_blue" + "immersiveweapons:smoke_grenade_blue" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_blue" + "recipe": "immersiveweapons:smoke_grenade_blue" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_green.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_green.json new file mode 100644 index 000000000..b28d7e932 --- /dev/null +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_green.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "immersiveweapons:smoke_grenade_green" + ] + }, + "criteria": { + "smoke_powder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "immersiveweapons:smoke_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "immersiveweapons:smoke_grenade_green" + } + } + }, + "requirements": [ + [ + "smoke_powder", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_red.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_purple.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_red.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_purple.json index 9daa99b57..4f359fb45 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow_red.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_purple.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_arrow_red" + "immersiveweapons:smoke_grenade_purple" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow_red" + "recipe": "immersiveweapons:smoke_grenade_purple" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_red.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_red.json index fbe88c59e..f5ddf90b7 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_bomb_arrow.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_red.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:smoke_bomb_arrow" + "immersiveweapons:smoke_grenade_red" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:smoke_bomb_arrow" + "recipe": "immersiveweapons:smoke_grenade_red" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_yellow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_yellow.json new file mode 100644 index 000000000..b664e4e17 --- /dev/null +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/smoke_grenade_yellow.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "immersiveweapons:smoke_grenade_yellow" + ] + }, + "criteria": { + "smoke_powder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "immersiveweapons:smoke_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "immersiveweapons:smoke_grenade_yellow" + } + } + }, + "requirements": [ + [ + "smoke_powder", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_arrow.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_arrow.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_arrow.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_arrow.json index 2afae2ca3..147296644 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_arrow.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_arrow.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_arrow" + "immersiveweapons:wooden_arrow" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_arrow" + "recipe": "immersiveweapons:wooden_arrow" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_gauntlet.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_gauntlet.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_gauntlet.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_gauntlet.json index 24f263aab..bda239a9a 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_gauntlet.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_gauntlet.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_gauntlet" + "immersiveweapons:wooden_gauntlet" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_gauntlet" + "recipe": "immersiveweapons:wooden_gauntlet" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_musket_ball.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_musket_ball.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_musket_ball.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_musket_ball.json index 4efb66fea..715b86298 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_musket_ball.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_musket_ball.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_musket_ball" + "immersiveweapons:wooden_musket_ball" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_musket_ball" + "recipe": "immersiveweapons:wooden_musket_ball" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike.json index 58f8d5fa5..bff803a3a 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_pike" + "immersiveweapons:wooden_pike" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_pike" + "recipe": "immersiveweapons:wooden_pike" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_tool_rod.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike_head.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_tool_rod.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike_head.json index db25c1cca..0e5803f81 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_tool_rod.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_pike_head.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_tool_rod" + "immersiveweapons:wooden_pike_head" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_tool_rod" + "recipe": "immersiveweapons:wooden_pike_head" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike_head.json b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_tool_rod.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike_head.json rename to src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_tool_rod.json index a004cc18a..6b6f2e098 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wood_pike_head.json +++ b/src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/wooden_tool_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "immersiveweapons:wood_pike_head" + "immersiveweapons:wooden_tool_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "immersiveweapons:wood_pike_head" + "recipe": "immersiveweapons:wooden_tool_rod" } } }, diff --git a/src/generated/resources/data/immersiveweapons/advancements/shards.json b/src/generated/resources/data/immersiveweapons/advancements/shards.json index 7e0ddd58a..bdf0842df 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/shards.json +++ b/src/generated/resources/data/immersiveweapons/advancements/shards.json @@ -58,7 +58,7 @@ "items": [ { "items": [ - "immersiveweapons:wood_shard" + "immersiveweapons:wooden_shard" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/small_partss_table.json b/src/generated/resources/data/immersiveweapons/advancements/small_parts_table.json similarity index 100% rename from src/generated/resources/data/immersiveweapons/advancements/small_partss_table.json rename to src/generated/resources/data/immersiveweapons/advancements/small_parts_table.json diff --git a/src/generated/resources/data/immersiveweapons/advancements/smoke_bomb.json b/src/generated/resources/data/immersiveweapons/advancements/smoke_grenade.json similarity index 60% rename from src/generated/resources/data/immersiveweapons/advancements/smoke_bomb.json rename to src/generated/resources/data/immersiveweapons/advancements/smoke_grenade.json index cb4910124..0d1b2c74c 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/smoke_bomb.json +++ b/src/generated/resources/data/immersiveweapons/advancements/smoke_grenade.json @@ -1,14 +1,14 @@ { - "parent": "immersiveweapons:small_partss_table", + "parent": "immersiveweapons:small_parts_table", "display": { "icon": { - "item": "immersiveweapons:smoke_bomb" + "item": "immersiveweapons:smoke_grenade" }, "title": { - "translate": "advancements.immersiveweapons.smoke_bomb.title" + "translate": "advancements.immersiveweapons.smoke_grenade.title" }, "description": { - "translate": "advancements.immersiveweapons.smoke_bomb.description" + "translate": "advancements.immersiveweapons.smoke_grenade.description" }, "frame": "goal", "show_toast": true, @@ -22,7 +22,7 @@ "items": [ { "items": [ - "immersiveweapons:smoke_bomb" + "immersiveweapons:smoke_grenade_green" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/tool_rod.json b/src/generated/resources/data/immersiveweapons/advancements/tool_rod.json index 7da7ae901..1740d610c 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/tool_rod.json +++ b/src/generated/resources/data/immersiveweapons/advancements/tool_rod.json @@ -2,7 +2,7 @@ "parent": "immersiveweapons:root", "display": { "icon": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" }, "title": { "translate": "advancements.immersiveweapons.tool_rod.title" @@ -22,7 +22,7 @@ "items": [ { "items": [ - "immersiveweapons:wood_tool_rod" + "immersiveweapons:wooden_tool_rod" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/advancements/wood_shard.json b/src/generated/resources/data/immersiveweapons/advancements/wooden_shard.json similarity index 67% rename from src/generated/resources/data/immersiveweapons/advancements/wood_shard.json rename to src/generated/resources/data/immersiveweapons/advancements/wooden_shard.json index a36abf629..10a9ef701 100644 --- a/src/generated/resources/data/immersiveweapons/advancements/wood_shard.json +++ b/src/generated/resources/data/immersiveweapons/advancements/wooden_shard.json @@ -2,13 +2,13 @@ "parent": "immersiveweapons:shards", "display": { "icon": { - "item": "immersiveweapons:wood_shard" + "item": "immersiveweapons:wooden_shard" }, "title": { - "translate": "advancements.immersiveweapons.wood_shard.title" + "translate": "advancements.immersiveweapons.wooden_shard.title" }, "description": { - "translate": "advancements.immersiveweapons.wood_shard.description" + "translate": "advancements.immersiveweapons.wooden_shard.description" }, "frame": "goal", "show_toast": true, @@ -22,7 +22,7 @@ "items": [ { "items": [ - "immersiveweapons:wood_shard" + "immersiveweapons:wooden_shard" ] } ] diff --git a/src/generated/resources/data/immersiveweapons/recipes/cobalt_pike.json b/src/generated/resources/data/immersiveweapons/recipes/cobalt_pike.json index b828e3085..b8ec30f8c 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/cobalt_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/cobalt_pike.json @@ -14,7 +14,7 @@ "tag": "forge:ingots/cobalt" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { diff --git a/src/generated/resources/data/immersiveweapons/recipes/copper_pike.json b/src/generated/resources/data/immersiveweapons/recipes/copper_pike.json index 762b01f30..8ad7a210f 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/copper_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/copper_pike.json @@ -14,7 +14,7 @@ "tag": "forge:ingots/copper" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { diff --git a/src/generated/resources/data/immersiveweapons/recipes/diamond_pike.json b/src/generated/resources/data/immersiveweapons/recipes/diamond_pike.json index ace2080da..084c228cd 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/diamond_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/diamond_pike.json @@ -14,7 +14,7 @@ "tag": "forge:gems/diamond" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { diff --git a/src/generated/resources/data/immersiveweapons/recipes/gold_arrow.json b/src/generated/resources/data/immersiveweapons/recipes/golden_arrow.json similarity index 87% rename from src/generated/resources/data/immersiveweapons/recipes/gold_arrow.json rename to src/generated/resources/data/immersiveweapons/recipes/golden_arrow.json index f3e3da4bc..5544e7946 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/gold_arrow.json +++ b/src/generated/resources/data/immersiveweapons/recipes/golden_arrow.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "immersiveweapons:gold_arrow", + "item": "immersiveweapons:golden_arrow", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/gold_gauntlet.json b/src/generated/resources/data/immersiveweapons/recipes/golden_gauntlet.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/recipes/gold_gauntlet.json rename to src/generated/resources/data/immersiveweapons/recipes/golden_gauntlet.json index 107c3a6a1..b28f61b48 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/gold_gauntlet.json +++ b/src/generated/resources/data/immersiveweapons/recipes/golden_gauntlet.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "immersiveweapons:gold_gauntlet" + "item": "immersiveweapons:golden_gauntlet" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/gold_musket_ball.json b/src/generated/resources/data/immersiveweapons/recipes/golden_musket_ball.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/recipes/gold_musket_ball.json rename to src/generated/resources/data/immersiveweapons/recipes/golden_musket_ball.json index aadeb6805..d7aef5d91 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/gold_musket_ball.json +++ b/src/generated/resources/data/immersiveweapons/recipes/golden_musket_ball.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "immersiveweapons:gold_musket_ball", + "item": "immersiveweapons:golden_musket_ball", "count": 8 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/gold_pike.json b/src/generated/resources/data/immersiveweapons/recipes/golden_pike.json similarity index 62% rename from src/generated/resources/data/immersiveweapons/recipes/gold_pike.json rename to src/generated/resources/data/immersiveweapons/recipes/golden_pike.json index 9d7c7cb13..bb13f7a03 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/gold_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/golden_pike.json @@ -8,16 +8,16 @@ ], "key": { "a": { - "item": "immersiveweapons:gold_pike_head" + "item": "immersiveweapons:golden_pike_head" }, "b": { "tag": "forge:ingots/gold" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { - "item": "immersiveweapons:gold_pike" + "item": "immersiveweapons:golden_pike" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/gold_pike_head.json b/src/generated/resources/data/immersiveweapons/recipes/golden_pike_head.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/recipes/gold_pike_head.json rename to src/generated/resources/data/immersiveweapons/recipes/golden_pike_head.json index 2787d258a..e94a6c510 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/gold_pike_head.json +++ b/src/generated/resources/data/immersiveweapons/recipes/golden_pike_head.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "immersiveweapons:gold_pike_head" + "item": "immersiveweapons:golden_pike_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/ingots_metal_tinkering.json b/src/generated/resources/data/immersiveweapons/recipes/ingots_metal_tinkering.json index 769e616b2..e832c613c 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/ingots_metal_tinkering.json +++ b/src/generated/resources/data/immersiveweapons/recipes/ingots_metal_tinkering.json @@ -4,7 +4,7 @@ "tag": "forge:ingots/metal" }, "craftables": [ - "immersiveweapons:small_parts_metal_throwable_bomb", - "immersiveweapons:small_parts_metal_tool" + "immersiveweapons:grenade_assembly", + "immersiveweapons:tool_joint" ] } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/iron_pike.json b/src/generated/resources/data/immersiveweapons/recipes/iron_pike.json index 2724ac5c5..9c0a4bfd2 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/iron_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/iron_pike.json @@ -14,7 +14,7 @@ "tag": "forge:ingots/iron" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { diff --git a/src/generated/resources/data/immersiveweapons/recipes/pliers.json b/src/generated/resources/data/immersiveweapons/recipes/pliers.json index 493ce0ebe..2fcfac6ab 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/pliers.json +++ b/src/generated/resources/data/immersiveweapons/recipes/pliers.json @@ -11,7 +11,7 @@ "item": "minecraft:leather" }, "b": { - "item": "immersiveweapons:small_parts_metal_tool" + "item": "immersiveweapons:tool_joint" }, "c": { "tag": "forge:ingots/metal" diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade.json similarity index 67% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade.json index de8834629..ba7b90428 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ " cb", " a ", @@ -11,14 +11,14 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" } }, "result": { - "item": "immersiveweapons:smoke_bomb", + "item": "immersiveweapons:smoke_grenade", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow.json similarity index 75% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow.json index fe0425d4e..7f24958d0 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aa " @@ -14,7 +14,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow", + "item": "immersiveweapons:smoke_grenade_arrow", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_blue.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_blue.json similarity index 77% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_blue.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_blue.json index c3435389c..23426fa90 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_blue.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_blue.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aac" @@ -17,7 +17,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow_blue", + "item": "immersiveweapons:smoke_grenade_arrow_blue", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_green.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_green.json similarity index 77% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_green.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_green.json index 2f19747b5..24ce61422 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_green.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_green.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aac" @@ -17,7 +17,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow_green", + "item": "immersiveweapons:smoke_grenade_arrow_green", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_purple.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_purple.json similarity index 77% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_purple.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_purple.json index 25b483690..20501306e 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_purple.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_purple.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aac" @@ -17,7 +17,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow_purple", + "item": "immersiveweapons:smoke_grenade_arrow_purple", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_red.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_red.json similarity index 77% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_red.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_red.json index 2b4642f77..c44651302 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_red.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_red.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aac" @@ -17,7 +17,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow_red", + "item": "immersiveweapons:smoke_grenade_arrow_red", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_yellow.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_yellow.json similarity index 77% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_yellow.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_yellow.json index f9c3f3160..9702cd61b 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_arrow_yellow.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_arrow_yellow.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "aab", "aac" @@ -17,7 +17,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_arrow_yellow", + "item": "immersiveweapons:smoke_grenade_arrow_yellow", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_blue.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_blue.json similarity index 69% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_blue.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_blue.json index 0f4cdc647..8c92c32a8 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_blue.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_blue.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "dcb", " a ", @@ -11,7 +11,7 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_blue", + "item": "immersiveweapons:smoke_grenade_blue", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_green.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_green.json similarity index 69% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_green.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_green.json index cded4689a..7b8617657 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_green.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_green.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "dcb", " a ", @@ -11,7 +11,7 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_green", + "item": "immersiveweapons:smoke_grenade_green", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_purple.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_purple.json similarity index 69% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_purple.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_purple.json index 5b77534c8..7e6689517 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_purple.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_purple.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "dcb", " a ", @@ -11,7 +11,7 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_purple", + "item": "immersiveweapons:smoke_grenade_purple", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_red.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_red.json similarity index 70% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_red.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_red.json index 211182d29..1584e1b00 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_red.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_red.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "dcb", " a ", @@ -11,7 +11,7 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_red", + "item": "immersiveweapons:smoke_grenade_red", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_yellow.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_yellow.json similarity index 69% rename from src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_yellow.json rename to src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_yellow.json index 44c1843d9..a3f413ebf 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_bomb_yellow.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_grenade_yellow.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "smoke_bomb", + "group": "smoke_grenade", "pattern": [ "dcb", " a ", @@ -11,7 +11,7 @@ "item": "minecraft:bamboo" }, "b": { - "item": "immersiveweapons:small_parts_metal_throwable_bomb" + "item": "immersiveweapons:grenade_assembly" }, "c": { "item": "immersiveweapons:smoke_powder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "immersiveweapons:smoke_bomb_yellow", + "item": "immersiveweapons:smoke_grenade_yellow", "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/smoke_powder.json b/src/generated/resources/data/immersiveweapons/recipes/smoke_powder.json index bbeba2c2b..359f42cf2 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/smoke_powder.json +++ b/src/generated/resources/data/immersiveweapons/recipes/smoke_powder.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shapeless", - "group": "smoke_bomb", + "group": "smoke_grenade", "ingredients": [ { "item": "immersiveweapons:mortar_and_pestle" diff --git a/src/generated/resources/data/immersiveweapons/recipes/stone_pike.json b/src/generated/resources/data/immersiveweapons/recipes/stone_pike.json index d240bf5db..b39b7f782 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/stone_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/stone_pike.json @@ -14,7 +14,7 @@ "tag": "minecraft:stone_tool_materials" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_arrow.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_arrow.json similarity index 87% rename from src/generated/resources/data/immersiveweapons/recipes/wood_arrow.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_arrow.json index 85abecbf4..66f3544ac 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_arrow.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_arrow.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "immersiveweapons:wood_arrow", + "item": "immersiveweapons:wooden_arrow", "count": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_gauntlet.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_gauntlet.json similarity index 84% rename from src/generated/resources/data/immersiveweapons/recipes/wood_gauntlet.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_gauntlet.json index a6ed51719..dbdf7f7db 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_gauntlet.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_gauntlet.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "immersiveweapons:wood_gauntlet" + "item": "immersiveweapons:wooden_gauntlet" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_musket_ball.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_musket_ball.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/recipes/wood_musket_ball.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_musket_ball.json index 203e569d8..b1d7a2732 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_musket_ball.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_musket_ball.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "immersiveweapons:wood_musket_ball", + "item": "immersiveweapons:wooden_musket_ball", "count": 8 } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_pike.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_pike.json similarity index 62% rename from src/generated/resources/data/immersiveweapons/recipes/wood_pike.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_pike.json index af02a6585..031351380 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_pike.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_pike.json @@ -8,16 +8,16 @@ ], "key": { "a": { - "item": "immersiveweapons:wood_pike_head" + "item": "immersiveweapons:wooden_pike_head" }, "b": { "tag": "minecraft:planks" }, "c": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } }, "result": { - "item": "immersiveweapons:wood_pike" + "item": "immersiveweapons:wooden_pike" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_pike_head.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_pike_head.json similarity index 83% rename from src/generated/resources/data/immersiveweapons/recipes/wood_pike_head.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_pike_head.json index 18ebea8bb..bb9614364 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_pike_head.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_pike_head.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "immersiveweapons:wood_pike_head" + "item": "immersiveweapons:wooden_pike_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/recipes/wood_tool_rod.json b/src/generated/resources/data/immersiveweapons/recipes/wooden_tool_rod.json similarity index 79% rename from src/generated/resources/data/immersiveweapons/recipes/wood_tool_rod.json rename to src/generated/resources/data/immersiveweapons/recipes/wooden_tool_rod.json index cea4b9f5a..c054ebfe9 100644 --- a/src/generated/resources/data/immersiveweapons/recipes/wood_tool_rod.json +++ b/src/generated/resources/data/immersiveweapons/recipes/wooden_tool_rod.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "immersiveweapons:wood_tool_rod" + "item": "immersiveweapons:wooden_tool_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveweapons/tags/items/projectiles/musket_balls.json b/src/generated/resources/data/immersiveweapons/tags/items/projectiles/musket_balls.json index 7cd2d6bb6..11c0f6b7b 100644 --- a/src/generated/resources/data/immersiveweapons/tags/items/projectiles/musket_balls.json +++ b/src/generated/resources/data/immersiveweapons/tags/items/projectiles/musket_balls.json @@ -1,12 +1,12 @@ { "replace": false, "values": [ - "immersiveweapons:wood_musket_ball", + "immersiveweapons:wooden_musket_ball", "immersiveweapons:stone_musket_ball", "immersiveweapons:copper_musket_ball", "immersiveweapons:iron_musket_ball", "immersiveweapons:cobalt_musket_ball", - "immersiveweapons:gold_musket_ball", + "immersiveweapons:golden_musket_ball", "immersiveweapons:diamond_musket_ball", "immersiveweapons:netherite_musket_ball" ] diff --git a/src/generated/resources/data/immersiveweapons/tags/items/shards/wood.json b/src/generated/resources/data/immersiveweapons/tags/items/shards/wood.json index 480501bdd..4d35b2b45 100644 --- a/src/generated/resources/data/immersiveweapons/tags/items/shards/wood.json +++ b/src/generated/resources/data/immersiveweapons/tags/items/shards/wood.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "immersiveweapons:wood_shard" + "immersiveweapons:wooden_shard" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/arrows.json b/src/generated/resources/data/minecraft/tags/items/arrows.json index ed4a3c5d0..89f820214 100644 --- a/src/generated/resources/data/minecraft/tags/items/arrows.json +++ b/src/generated/resources/data/minecraft/tags/items/arrows.json @@ -1,19 +1,19 @@ { "replace": false, "values": [ - "immersiveweapons:wood_arrow", + "immersiveweapons:wooden_arrow", "immersiveweapons:stone_arrow", "immersiveweapons:copper_arrow", "immersiveweapons:iron_arrow", "immersiveweapons:cobalt_arrow", - "immersiveweapons:gold_arrow", + "immersiveweapons:golden_arrow", "immersiveweapons:diamond_arrow", "immersiveweapons:netherite_arrow", - "immersiveweapons:smoke_bomb_arrow", - "immersiveweapons:smoke_bomb_arrow_red", - "immersiveweapons:smoke_bomb_arrow_green", - "immersiveweapons:smoke_bomb_arrow_blue", - "immersiveweapons:smoke_bomb_arrow_purple", - "immersiveweapons:smoke_bomb_arrow_yellow" + "immersiveweapons:smoke_grenade_arrow", + "immersiveweapons:smoke_grenade_arrow_red", + "immersiveweapons:smoke_grenade_arrow_green", + "immersiveweapons:smoke_grenade_arrow_blue", + "immersiveweapons:smoke_grenade_arrow_purple", + "immersiveweapons:smoke_grenade_arrow_yellow" ] } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/TooltipHandler.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/TooltipHandler.java index b4b2970f3..6ab05dd55 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/TooltipHandler.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/TooltipHandler.java @@ -62,57 +62,57 @@ public static void addItemTooltip(ItemTooltipEvent event) { if (stack.getItem() == DeferredRegistryHandler.DIAMOND_ARROW.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.diamond_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.GOLD_ARROW.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gold_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.GOLDEN_ARROW.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.golden_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.STONE_ARROW.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.stone_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.WOOD_ARROW.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wood_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.WOODEN_ARROW.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wooden_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.NETHERITE_ARROW.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.netherite_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_red").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_red").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_green").withStyle(ChatFormatting.GREEN, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_green").withStyle(ChatFormatting.GREEN, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_blue").withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_blue").withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_purple").withStyle(ChatFormatting.LIGHT_PURPLE, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_purple").withStyle(ChatFormatting.LIGHT_PURPLE, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_yellow").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_arrow").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_yellow").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); } // Bullets - if (stack.getItem() == DeferredRegistryHandler.WOOD_MUSKET_BALL.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wood_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wooden_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.STONE_MUSKET_BALL.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.stone_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.GOLD_MUSKET_BALL.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gold_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.golden_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.COPPER_MUSKET_BALL.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.copper_musket_ball").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); @@ -131,7 +131,7 @@ public static void addItemTooltip(ItemTooltipEvent event) { } // Pikes - if (stack.getItem() == DeferredRegistryHandler.WOOD_PIKE.get() || stack.getItem() == DeferredRegistryHandler.STONE_PIKE.get() || stack.getItem() == DeferredRegistryHandler.GOLD_PIKE.get() || stack.getItem() == DeferredRegistryHandler.COPPER_PIKE.get() || stack.getItem() == DeferredRegistryHandler.IRON_PIKE.get() || stack.getItem() == DeferredRegistryHandler.COBALT_PIKE.get() || stack.getItem() == DeferredRegistryHandler.DIAMOND_PIKE.get() || stack.getItem() == DeferredRegistryHandler.NETHERITE_PIKE.get()) { + if (stack.getItem() == DeferredRegistryHandler.WOODEN_PIKE.get() || stack.getItem() == DeferredRegistryHandler.STONE_PIKE.get() || stack.getItem() == DeferredRegistryHandler.GOLDEN_PIKE.get() || stack.getItem() == DeferredRegistryHandler.COPPER_PIKE.get() || stack.getItem() == DeferredRegistryHandler.IRON_PIKE.get() || stack.getItem() == DeferredRegistryHandler.COBALT_PIKE.get() || stack.getItem() == DeferredRegistryHandler.DIAMOND_PIKE.get() || stack.getItem() == DeferredRegistryHandler.NETHERITE_PIKE.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.pike").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } @@ -147,28 +147,28 @@ public static void addItemTooltip(ItemTooltipEvent event) { } // Throwables - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_RED.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_red").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_RED.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_red").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_GREEN.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_green").withStyle(ChatFormatting.GREEN, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_green").withStyle(ChatFormatting.GREEN, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_BLUE.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_blue").withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_BLUE.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_blue").withStyle(ChatFormatting.BLUE, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_PURPLE.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_purple").withStyle(ChatFormatting.LIGHT_PURPLE, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_PURPLE.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_purple").withStyle(ChatFormatting.LIGHT_PURPLE, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.SMOKE_BOMB_YELLOW.get()) { - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_bomb_yellow").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); + if (stack.getItem() == DeferredRegistryHandler.SMOKE_GRENADE_YELLOW.get()) { + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.smoke_grenade_yellow").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.MOLOTOV_COCKTAIL.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.molotov_cocktail").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); @@ -206,17 +206,17 @@ public static void addItemTooltip(ItemTooltipEvent event) { } // Gauntlets - if (stack.getItem() == DeferredRegistryHandler.WOOD_GAUNTLET.get()) { + if (stack.getItem() == DeferredRegistryHandler.WOODEN_GAUNTLET.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wood_gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.wooden_gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.STONE_GAUNTLET.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.stone_gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } - if (stack.getItem() == DeferredRegistryHandler.GOLD_GAUNTLET.get()) { + if (stack.getItem() == DeferredRegistryHandler.GOLDEN_GAUNTLET.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); - event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gold_gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); + event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.golden_gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } if (stack.getItem() == DeferredRegistryHandler.COPPER_GAUNTLET.get()) { event.getToolTip().add(new TranslatableComponent("immersiveweapons.tooltip.gauntlet").withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticle.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticle.java similarity index 75% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticle.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticle.java index d77c74d47..430bc931f 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticle.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticle.java @@ -1,4 +1,4 @@ -package com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb; +package com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade; import com.mojang.math.Vector3f; import net.minecraft.client.multiplayer.ClientLevel; @@ -6,28 +6,28 @@ import net.minecraft.util.Mth; import org.jetbrains.annotations.NotNull; -public class SmokeBombParticle extends TextureSheetParticle { +public class SmokeGrenadeParticle extends TextureSheetParticle { protected static SpriteSet sprites; - public static class Provider implements ParticleProvider { + public static class Provider implements ParticleProvider { public Provider(SpriteSet pSprites) { sprites = pSprites; } @Override - public Particle createParticle(@NotNull SmokeBombParticleOptions pType, @NotNull ClientLevel pLevel, double pX, double pY, double pZ, + public Particle createParticle(@NotNull SmokeGrenadeParticleOptions pType, @NotNull ClientLevel pLevel, double pX, double pY, double pZ, double pXSpeed, double pYSpeed, double pZSpeed) { - return new SmokeBombParticle(pLevel, pX, pY, pZ, + return new SmokeGrenadeParticle(pLevel, pX, pY, pZ, pXSpeed, pYSpeed, pZSpeed, sprites, pType.getColor()); } } - protected SmokeBombParticle(ClientLevel level, double x, double y, double z, - double xSpeed, double ySpeed, - double zSpeed, SpriteSet spriteSet, Vector3f color) { + protected SmokeGrenadeParticle(ClientLevel level, double x, double y, double z, + double xSpeed, double ySpeed, + double zSpeed, SpriteSet spriteSet, Vector3f color) { super(level, x, y, z, 0.0D, 0.0D, 0.0D); friction = 0.96F; diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticleOptions.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticleOptions.java similarity index 60% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticleOptions.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticleOptions.java index 50ac4b3c8..8c55e6094 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_bomb/SmokeBombParticleOptions.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/client/particle/smoke_grenade/SmokeGrenadeParticleOptions.java @@ -1,4 +1,4 @@ -package com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb; +package com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import com.mojang.brigadier.StringReader; @@ -16,38 +16,37 @@ import java.util.Locale; -public class SmokeBombParticleOptions implements ParticleOptions { +public class SmokeGrenadeParticleOptions implements ParticleOptions { - public static final Codec CODEC = RecordCodecBuilder.create((particleOptionsInstance) + public static final Codec CODEC = RecordCodecBuilder.create((particleOptionsInstance) -> particleOptionsInstance .group(Vector3f.CODEC.fieldOf("color").forGetter((particleOptions) -> particleOptions.color), Codec.FLOAT.fieldOf("scale").forGetter((particleOptions) -> particleOptions.scale)) - .apply(particleOptionsInstance, SmokeBombParticleOptions::new)); + .apply(particleOptionsInstance, SmokeGrenadeParticleOptions::new)); protected final Vector3f color; protected final float scale; - @SuppressWarnings("deprecation") - public static final ParticleOptions.Deserializer DESERIALIZER = new ParticleOptions.Deserializer<>() { + public static final ParticleOptions.Deserializer DESERIALIZER = new ParticleOptions.Deserializer<>() { @Override - public @NotNull SmokeBombParticleOptions fromCommand(@NotNull ParticleType particleType, - @NotNull StringReader reader) throws CommandSyntaxException { + public @NotNull SmokeGrenadeParticleOptions fromCommand(@NotNull ParticleType particleType, + @NotNull StringReader reader) throws CommandSyntaxException { - Vector3f vector3f = SmokeBombParticleOptions.readVector3f(reader); + Vector3f vector3f = SmokeGrenadeParticleOptions.readVector3f(reader); reader.expect(' '); float vibrancy = reader.readFloat(); - return new SmokeBombParticleOptions(vector3f, vibrancy); + return new SmokeGrenadeParticleOptions(vector3f, vibrancy); } @Override - public @NotNull SmokeBombParticleOptions fromNetwork(@NotNull ParticleType particleType, - @NotNull FriendlyByteBuf byteBuf) { + public @NotNull SmokeGrenadeParticleOptions fromNetwork(@NotNull ParticleType particleType, + @NotNull FriendlyByteBuf byteBuf) { - return new SmokeBombParticleOptions(SmokeBombParticleOptions.readVector3f(byteBuf), byteBuf.readFloat()); + return new SmokeGrenadeParticleOptions(SmokeGrenadeParticleOptions.readVector3f(byteBuf), byteBuf.readFloat()); } }; - public SmokeBombParticleOptions(Vector3f vector3f, float vibrancy) { + public SmokeGrenadeParticleOptions(Vector3f vector3f, float vibrancy) { color = vector3f; scale = Mth.clamp(vibrancy, 0.001F, 100.0F); } @@ -89,11 +88,11 @@ public float getScale() { } @Override - public @NotNull ParticleType getType() { - return DeferredRegistryHandler.SMOKE_BOMB_PARTICLE.get(); + public @NotNull ParticleType getType() { + return DeferredRegistryHandler.SMOKE_GRENADE_PARTICLE.get(); } - public static class SmokeBombColors { + public static class SmokeGrenadeColors { public static final Vector3f GRAY = new Vector3f(Vec3.fromRGB24(16777215)); public static final Vector3f RED = new Vector3f(Vec3.fromRGB24(16711680)); public static final Vector3f GREEN = new Vector3f(Vec3.fromRGB24(5294200)); @@ -112,16 +111,16 @@ public static class SmokeBombColors { *
3 -> Blue *
4 -> Purple *
5 -> Yellow - * @return SmokeBombParticleOptions + * @return SmokeGrenadeParticleOptions */ - public static SmokeBombParticleOptions getParticleByColor(int colorID) { + public static SmokeGrenadeParticleOptions getParticleByColor(int colorID) { return switch (colorID) { - case 1 -> new SmokeBombParticleOptions(SmokeBombColors.RED, 1.0F); - case 2 -> new SmokeBombParticleOptions(SmokeBombColors.GREEN, 1.0F); - case 3 -> new SmokeBombParticleOptions(SmokeBombColors.BLUE, 1.0F); - case 4 -> new SmokeBombParticleOptions(SmokeBombColors.PURPLE, 1.0F); - case 5 -> new SmokeBombParticleOptions(SmokeBombColors.YELLOW, 1.0F); - default -> new SmokeBombParticleOptions(SmokeBombColors.GRAY, 1.0F); + case 1 -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.RED, 1.0F); + case 2 -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.GREEN, 1.0F); + case 3 -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.BLUE, 1.0F); + case 4 -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.PURPLE, 1.0F); + case 5 -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.YELLOW, 1.0F); + default -> new SmokeGrenadeParticleOptions(SmokeGrenadeColors.GRAY, 1.0F); }; } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/config/CommonConfig.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/config/CommonConfig.java index 7b775f773..bd18f9789 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/config/CommonConfig.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/config/CommonConfig.java @@ -11,7 +11,7 @@ public class CommonConfig { public static final CommonConfig COMMON; // General settings - public static ForgeConfigSpec.ConfigValue MAX_SMOKE_BOMB_PARTICLES; + public static ForgeConfigSpec.ConfigValue MAX_SMOKE_GRENADE_PARTICLES; public static ForgeConfigSpec.ConfigValue BULLETS_BREAK_GLASS; public static ForgeConfigSpec.ConfigValue TILTROS_ENABLED; @@ -68,11 +68,11 @@ public class CommonConfig { builder.push("Server Configuration"); builder.push("Miscellaneous"); - MAX_SMOKE_BOMB_PARTICLES = builder - .comment("Set the maximum number of particles produced by the smoke bomb - Default 96\n" + + MAX_SMOKE_GRENADE_PARTICLES = builder + .comment("Set the maximum number of particles produced by the smoke grenade - Default 96\n" + "Setting this higher can make clients laggy, setting to 0 effectively disables it") - .translation("config.immersiveweapons.max_smoke_bomb_particles") - .define("Max smoke bomb particles", 96); + .translation("config.immersiveweapons.max_smoke_grenade_particles") + .define("Max smoke grenade particles", 96); BULLETS_BREAK_GLASS = builder .comment("Enable bullets breaking glass - Default true") .translation("config.immersiveweapons.bullets_break_glass") diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/advancements/IWAdvancements.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/advancements/IWAdvancements.java index 6bc671631..43319d9e5 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/advancements/IWAdvancements.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/advancements/IWAdvancements.java @@ -408,12 +408,12 @@ public void accept(Consumer consumer) { // Tool advancements Advancement craftToolRod = Builder.advancement().parent(root) - .display(DeferredRegistryHandler.WOOD_TOOL_ROD.get(), + .display(DeferredRegistryHandler.WOODEN_TOOL_ROD.get(), new TranslatableComponent("advancements.immersiveweapons.tool_rod.title"), new TranslatableComponent("advancements.immersiveweapons.tool_rod.description"), null, FrameType.TASK, true, true, false) .addCriterion("hold", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOOD_TOOL_ROD.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOODEN_TOOL_ROD.get())) .save(consumer, "immersiveweapons:tool_rod"); Builder.advancement().parent(craftToolRod) @@ -422,7 +422,7 @@ public void accept(Consumer consumer) { new TranslatableComponent("advancements.immersiveweapons.pike.description"), null, FrameType.TASK, true, true, false) .addCriterion("hold", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOOD_PIKE.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOODEN_PIKE.get())) .addCriterion("hold1", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.STONE_PIKE.get())) .addCriterion("hold2", @@ -430,7 +430,7 @@ public void accept(Consumer consumer) { .addCriterion("hold3", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.COPPER_PIKE.get())) .addCriterion("hold4", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.GOLD_PIKE.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.GOLDEN_PIKE.get())) .addCriterion("hold5", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.DIAMOND_PIKE.get())) .addCriterion("hold6", @@ -452,7 +452,7 @@ public void accept(Consumer consumer) { .addCriterion("hold2", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.STONE_SHARD.get())) .addCriterion("hold3", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOOD_SHARD.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOODEN_SHARD.get())) .addCriterion("hold4", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.DIAMOND_SHARD.get())) .addCriterion("hold5", @@ -461,13 +461,13 @@ public void accept(Consumer consumer) { .save(consumer, "immersiveweapons:shards"); Builder.advancement().parent(shards) - .display(DeferredRegistryHandler.WOOD_SHARD.get(), - new TranslatableComponent("advancements.immersiveweapons.wood_shard.title"), - new TranslatableComponent("advancements.immersiveweapons.wood_shard.description"), + .display(DeferredRegistryHandler.WOODEN_SHARD.get(), + new TranslatableComponent("advancements.immersiveweapons.wooden_shard.title"), + new TranslatableComponent("advancements.immersiveweapons.wooden_shard.description"), null, FrameType.GOAL, true, true, false) .addCriterion("hold", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOOD_SHARD.get())) - .save(consumer, "immersiveweapons:wood_shard"); + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOODEN_SHARD.get())) + .save(consumer, "immersiveweapons:wooden_shard"); Builder.advancement().parent(shards) .display(DeferredRegistryHandler.STONE_SHARD.get(), @@ -509,7 +509,7 @@ public void accept(Consumer consumer) { .save(consumer, "immersiveweapons:netherite_projectile"); Builder.advancement().parent(root) - .display(DeferredRegistryHandler.GOLD_MUSKET_BALL.get(), + .display(DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get(), new TranslatableComponent("advancements.immersiveweapons.musket_ball.title"), new TranslatableComponent("advancements.immersiveweapons.musket_ball.description"), null, FrameType.TASK, true, true, false) @@ -524,7 +524,7 @@ public void accept(Consumer consumer) { null, FrameType.TASK, true, true, false) .addCriterion("hold", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.SMALL_PARTS_TABLE.get())) - .save(consumer, "immersiveweapons:small_partss_table"); + .save(consumer, "immersiveweapons:small_parts_table"); Builder.advancement().parent(smallPartsTable) .display(DeferredRegistryHandler.FLINTLOCK_PISTOL.get(), @@ -566,13 +566,13 @@ public void accept(Consumer consumer) { .save(consumer, "immersiveweapons:musket"); Builder.advancement().parent(smallPartsTable) - .display(DeferredRegistryHandler.SMOKE_BOMB.get(), - new TranslatableComponent("advancements.immersiveweapons.smoke_bomb.title"), - new TranslatableComponent("advancements.immersiveweapons.smoke_bomb.description"), + .display(DeferredRegistryHandler.SMOKE_GRENADE.get(), + new TranslatableComponent("advancements.immersiveweapons.smoke_grenade.title"), + new TranslatableComponent("advancements.immersiveweapons.smoke_grenade.description"), null, FrameType.GOAL, true, true, false) .addCriterion("hold", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.SMOKE_BOMB.get())) - .save(consumer, "immersiveweapons:smoke_bomb"); + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get())) + .save(consumer, "immersiveweapons:smoke_grenade"); Advancement craftAlcohol = Builder.advancement().parent(root) @@ -617,11 +617,11 @@ public void accept(Consumer consumer) { new TranslatableComponent("advancements.immersiveweapons.gauntlet.description"), null, FrameType.TASK, true, true, false) .addCriterion("hold", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOOD_GAUNTLET.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.WOODEN_GAUNTLET.get())) .addCriterion("hold1", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.STONE_GAUNTLET.get())) .addCriterion("hold2", - InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.GOLD_GAUNTLET.get())) + InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.GOLDEN_GAUNTLET.get())) .addCriterion("hold3", InventoryChangeTrigger.TriggerInstance.hasItems(DeferredRegistryHandler.COPPER_GAUNTLET.get())) .addCriterion("hold4", diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/models/lists/ItemModelLists.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/models/lists/ItemModelLists.java index 485f6aed0..69ad3dfd9 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/models/lists/ItemModelLists.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/models/lists/ItemModelLists.java @@ -17,37 +17,37 @@ public class ItemModelLists { ignoredItems.add(DeferredRegistryHandler.MUSKET.get()); ignoredItems.add(DeferredRegistryHandler.MUSKET_SCOPE.get()); ignoredItems.add(DeferredRegistryHandler.FLARE_GUN.get()); - ignoredItems.add(DeferredRegistryHandler.WOOD_PIKE.get()); + ignoredItems.add(DeferredRegistryHandler.WOODEN_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.STONE_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.COPPER_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.IRON_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.COBALT_PIKE.get()); - ignoredItems.add(DeferredRegistryHandler.GOLD_PIKE.get()); + ignoredItems.add(DeferredRegistryHandler.GOLDEN_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.DIAMOND_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.NETHERITE_PIKE.get()); ignoredItems.add(DeferredRegistryHandler.FLARE.get()); ignoredItems.add(DeferredRegistryHandler.MORTAR_SHELL.get()); ignoredItems.add(DeferredRegistryHandler.MOLOTOV_COCKTAIL.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB_BLUE.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB_RED.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB_GREEN.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB_PURPLE.get()); - ignoredItems.add(DeferredRegistryHandler.SMOKE_BOMB_YELLOW.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE_BLUE.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE_RED.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE_PURPLE.get()); + ignoredItems.add(DeferredRegistryHandler.SMOKE_GRENADE_YELLOW.get()); ignoredItems.add(DeferredRegistryHandler.EXPLOSIVE_CHOCOLATE_BAR.get()); ignoredItems.add(DeferredRegistryHandler.MRE.get()); - ignoredItems.add(DeferredRegistryHandler.WOOD_GAUNTLET.get()); + ignoredItems.add(DeferredRegistryHandler.WOODEN_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.STONE_GAUNTLET.get()); - ignoredItems.add(DeferredRegistryHandler.GOLD_GAUNTLET.get()); + ignoredItems.add(DeferredRegistryHandler.GOLDEN_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.COPPER_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.IRON_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.COBALT_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.DIAMOND_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.NETHERITE_GAUNTLET.get()); ignoredItems.add(DeferredRegistryHandler.BURNED_OAK_BOAT.get()); - ignoredItems.add(DeferredRegistryHandler.WOOD_MUSKET_BALL.get()); + ignoredItems.add(DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()); ignoredItems.add(DeferredRegistryHandler.STONE_MUSKET_BALL.get()); - ignoredItems.add(DeferredRegistryHandler.GOLD_MUSKET_BALL.get()); + ignoredItems.add(DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get()); ignoredItems.add(DeferredRegistryHandler.COPPER_MUSKET_BALL.get()); ignoredItems.add(DeferredRegistryHandler.IRON_MUSKET_BALL.get()); ignoredItems.add(DeferredRegistryHandler.COBALT_MUSKET_BALL.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/recipes/RecipeGenerator.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/recipes/RecipeGenerator.java index 4bebbd653..c8df97ff5 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/recipes/RecipeGenerator.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/recipes/RecipeGenerator.java @@ -55,7 +55,7 @@ protected void buildCraftingRecipes(@NotNull Consumer pFinishedR createTeslaItems(); createVanillaTieredItems(); createSmallPartsItems(); - createSmokeBombs(); + createSmokeGrenades(); createCorrugatedIronItems(); createShardItems(); createWarriorStatueItems(); @@ -283,33 +283,33 @@ private void createTeslaItems() { } private void createVanillaTieredItems() { - createWoodArrow(DeferredRegistryHandler.WOOD_ARROW.get()); + createWoodenArrow(DeferredRegistryHandler.WOODEN_ARROW.get()); createStoneArrow(DeferredRegistryHandler.STONE_ARROW.get()); - createGoldArrow(DeferredRegistryHandler.GOLD_ARROW.get()); + createGoldenArrow(DeferredRegistryHandler.GOLDEN_ARROW.get()); createIronArrow(DeferredRegistryHandler.IRON_ARROW.get()); createDiamondArrow(DeferredRegistryHandler.DIAMOND_ARROW.get()); createNetheriteArrow(DeferredRegistryHandler.NETHERITE_ARROW.get()); - createWoodMusketBall(DeferredRegistryHandler.WOOD_MUSKET_BALL.get()); + createWoodenMusketBall(DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()); createStoneMusketBall(DeferredRegistryHandler.STONE_MUSKET_BALL.get()); - createGoldMusketBall(DeferredRegistryHandler.GOLD_MUSKET_BALL.get()); + createGoldenMusketBall(DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get()); createIronMusketBall(DeferredRegistryHandler.IRON_MUSKET_BALL.get()); createDiamondMusketBall(DeferredRegistryHandler.DIAMOND_MUSKET_BALL.get()); createNetheriteMusketBall(DeferredRegistryHandler.NETHERITE_MUSKET_BALL.get()); - createWoodGauntlet(DeferredRegistryHandler.WOOD_GAUNTLET.get()); + createWoodenGauntlet(DeferredRegistryHandler.WOODEN_GAUNTLET.get()); createStoneGauntlet(DeferredRegistryHandler.STONE_GAUNTLET.get()); - createGoldGauntlet(DeferredRegistryHandler.GOLD_GAUNTLET.get()); + createGoldenGauntlet(DeferredRegistryHandler.GOLDEN_GAUNTLET.get()); createIronGauntlet(DeferredRegistryHandler.IRON_GAUNTLET.get()); createDiamondGauntlet(DeferredRegistryHandler.DIAMOND_GAUNTLET.get()); netheriteSmithing(DeferredRegistryHandler.DIAMOND_GAUNTLET.get(), DeferredRegistryHandler.NETHERITE_GAUNTLET.get()); - createWoodPike(DeferredRegistryHandler.WOOD_PIKE.get(), DeferredRegistryHandler.WOOD_PIKE_HEAD.get()); + createWoodenPike(DeferredRegistryHandler.WOODEN_PIKE.get(), DeferredRegistryHandler.WOODEN_PIKE_HEAD.get()); createStonePike(DeferredRegistryHandler.STONE_PIKE.get(), DeferredRegistryHandler.STONE_PIKE_HEAD.get()); - createGoldPike(DeferredRegistryHandler.GOLD_PIKE.get(), DeferredRegistryHandler.GOLD_PIKE_HEAD.get()); + createGoldenPike(DeferredRegistryHandler.GOLDEN_PIKE.get(), DeferredRegistryHandler.GOLDEN_PIKE_HEAD.get()); createIronPike(DeferredRegistryHandler.IRON_PIKE.get(), DeferredRegistryHandler.IRON_PIKE_HEAD.get()); createDiamondPike(DeferredRegistryHandler.DIAMOND_PIKE.get(), DeferredRegistryHandler.DIAMOND_PIKE_HEAD.get()); netheriteSmithing(DeferredRegistryHandler.DIAMOND_PIKE.get(), DeferredRegistryHandler.NETHERITE_PIKE.get()); - createWoodPikeHead(DeferredRegistryHandler.WOOD_PIKE_HEAD.get()); + createWoodenPikeHead(DeferredRegistryHandler.WOODEN_PIKE_HEAD.get()); createStonePikeHead(DeferredRegistryHandler.STONE_PIKE_HEAD.get()); - createGoldPikeHead(DeferredRegistryHandler.GOLD_PIKE_HEAD.get()); + createGoldenPikeHead(DeferredRegistryHandler.GOLDEN_PIKE_HEAD.get()); createIronPikeHead(DeferredRegistryHandler.IRON_PIKE_HEAD.get()); createDiamondPikeHead(DeferredRegistryHandler.DIAMOND_PIKE_HEAD.get()); } @@ -328,8 +328,8 @@ private void createSmallPartsItems() { GOLD_INGOT_CRAFTABLES.add(DeferredRegistryHandler.TRIGGER_ASSEMBLY.get()); GOLD_INGOT_CRAFTABLES.add(DeferredRegistryHandler.SCOPE_MOUNT.get()); - METAL_INGOT_CRAFTABLES.add(DeferredRegistryHandler.SMALL_PARTS_METAL_THROWABLE_BOMB.get()); - METAL_INGOT_CRAFTABLES.add(DeferredRegistryHandler.SMALL_PARTS_METAL_TOOL.get()); + METAL_INGOT_CRAFTABLES.add(DeferredRegistryHandler.GRENADE_ASSEMBLY.get()); + METAL_INGOT_CRAFTABLES.add(DeferredRegistryHandler.TOOL_JOINT.get()); PLANK_CRAFTABLES.add(DeferredRegistryHandler.GAUNTLET_SCAFFOLDING.get()); PLANK_CRAFTABLES.add(DeferredRegistryHandler.HEAVY_WOODEN_STOCK.get()); @@ -358,19 +358,19 @@ private void createSmallPartsItems() { .save(finishedRecipeConsumer); } - private void createSmokeBombs() { - createSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB.get()); - createColoredSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB_BLUE.get(), Tags.Items.DYES_BLUE); - createColoredSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB_GREEN.get(), Tags.Items.DYES_GREEN); - createColoredSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB_RED.get(), Tags.Items.DYES_RED); - createColoredSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB_PURPLE.get(), Tags.Items.DYES_PURPLE); - createColoredSmokeBomb(DeferredRegistryHandler.SMOKE_BOMB_YELLOW.get(), Tags.Items.DYES_YELLOW); - createSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW.get()); - createColoredSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE.get(), Tags.Items.DYES_BLUE); - createColoredSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN.get(), Tags.Items.DYES_GREEN); - createColoredSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED.get(), Tags.Items.DYES_RED); - createColoredSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE.get(), Tags.Items.DYES_PURPLE); - createColoredSmokeBombArrow(DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW.get(), Tags.Items.DYES_YELLOW); + private void createSmokeGrenades() { + createSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE.get()); + createColoredSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE_BLUE.get(), Tags.Items.DYES_BLUE); + createColoredSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get(), Tags.Items.DYES_GREEN); + createColoredSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE_RED.get(), Tags.Items.DYES_RED); + createColoredSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE_PURPLE.get(), Tags.Items.DYES_PURPLE); + createColoredSmokeGrenade(DeferredRegistryHandler.SMOKE_GRENADE_YELLOW.get(), Tags.Items.DYES_YELLOW); + createSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get()); + createColoredSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get(), Tags.Items.DYES_BLUE); + createColoredSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get(), Tags.Items.DYES_GREEN); + createColoredSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get(), Tags.Items.DYES_RED); + createColoredSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get(), Tags.Items.DYES_PURPLE); + createColoredSmokeGrenadeArrow(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get(), Tags.Items.DYES_YELLOW); // Create smoke powder ShapelessRecipeBuilder.shapeless(DeferredRegistryHandler.SMOKE_POWDER.get(), 4) @@ -378,7 +378,7 @@ private void createSmokeBombs() { .requires(Items.GUNPOWDER) .requires(ItemTags.COALS) .requires(ItemTags.LEAVES) - .group("smoke_bomb") + .group("smoke_grenade") .unlockedBy("mortar_and_pestle", has(DeferredRegistryHandler.MORTAR_AND_PESTLE.get())) .save(finishedRecipeConsumer); } @@ -822,13 +822,13 @@ private void createMiscellaneousItems() { // Pliers ShapedRecipeBuilder.shaped(DeferredRegistryHandler.PLIERS.get()) .define('a', Items.LEATHER) - .define('b', DeferredRegistryHandler.SMALL_PARTS_METAL_TOOL.get()) + .define('b', DeferredRegistryHandler.TOOL_JOINT.get()) .define('c', ForgeItemTagGroups.METAL_INGOTS) .pattern(" c ") .pattern(" b ") .pattern("a a") .group("pliers") - .unlockedBy("small_parts_metal_tool", has(DeferredRegistryHandler.SMALL_PARTS_METAL_TOOL.get())) + .unlockedBy("small_parts_metal_tool", has(DeferredRegistryHandler.TOOL_JOINT.get())) .save(finishedRecipeConsumer); // Gunpowder (from sulfur) ShapelessRecipeBuilder.shapeless(Items.GUNPOWDER) @@ -837,8 +837,8 @@ private void createMiscellaneousItems() { .group("gunpowder") .unlockedBy("sulfur", has(DeferredRegistryHandler.SULFUR.get())) .save(finishedRecipeConsumer); - // Wood tool rod - ShapedRecipeBuilder.shaped(DeferredRegistryHandler.WOOD_TOOL_ROD.get()) + // Wooden tool rod + ShapedRecipeBuilder.shaped(DeferredRegistryHandler.WOODEN_TOOL_ROD.get()) .define('a', ItemTags.PLANKS) .pattern(" a ") .pattern("a ") @@ -1379,11 +1379,11 @@ private static void createTeslaSynthesizer(ItemLike synthesizerItem) { .save(finishedRecipeConsumer); } - private static void createWoodArrow(ItemLike arrowItem) { + private static void createWoodenArrow(ItemLike arrowItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(arrowItem, 4) .group("wood") - .unlockedBy("wood_shard", has(ImmersiveWeaponsItemTagGroups.WOOD_SHARDS)); - createArrow(builder, ImmersiveWeaponsItemTagGroups.WOOD_SHARDS); + .unlockedBy("wooden_shard", has(ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS)); + createArrow(builder, ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS); } private static void createStoneArrow(ItemLike arrowItem) { @@ -1393,7 +1393,7 @@ private static void createStoneArrow(ItemLike arrowItem) { createArrow(builder, ImmersiveWeaponsItemTagGroups.STONE_SHARDS); } - private static void createGoldArrow(ItemLike arrowItem) { + private static void createGoldenArrow(ItemLike arrowItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(arrowItem, 4) .group("gold") .unlockedBy("gold_ingot", has(Tags.Items.INGOTS_GOLD)); @@ -1426,11 +1426,11 @@ private static void createNetheriteArrow(ItemLike arrowItem) { .save(finishedRecipeConsumer); } - private static void createWoodMusketBall(ItemLike musketBallItem) { + private static void createWoodenMusketBall(ItemLike musketBallItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(musketBallItem, 8) .group("wood") - .unlockedBy("wood_shard", has(ImmersiveWeaponsItemTagGroups.WOOD_SHARDS)); - createMusketBall(builder, ImmersiveWeaponsItemTagGroups.WOOD_SHARDS); + .unlockedBy("wooden_shard", has(ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS)); + createMusketBall(builder, ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS); } private static void createStoneMusketBall(ItemLike musketBallItem) { @@ -1440,7 +1440,7 @@ private static void createStoneMusketBall(ItemLike musketBallItem) { createMusketBall(builder, ImmersiveWeaponsItemTagGroups.STONE_SHARDS); } - private static void createGoldMusketBall(ItemLike musketBallItem) { + private static void createGoldenMusketBall(ItemLike musketBallItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(musketBallItem, 8) .group("gold") .unlockedBy("gold_ingot", has(Tags.Items.INGOTS_GOLD)); @@ -1473,7 +1473,7 @@ private static void createNetheriteMusketBall(ItemLike musketBallItem) { .save(finishedRecipeConsumer); } - private static void createWoodGauntlet(ItemLike gauntletItem) { + private static void createWoodenGauntlet(ItemLike gauntletItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(gauntletItem) .group("wood") .unlockedBy("planks", has(ItemTags.PLANKS)); @@ -1487,7 +1487,7 @@ private static void createStoneGauntlet(ItemLike gauntletItem) { createGauntlet(builder, ItemTags.STONE_TOOL_MATERIALS); } - private static void createGoldGauntlet(ItemLike gauntletItem) { + private static void createGoldenGauntlet(ItemLike gauntletItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(gauntletItem) .group("gold") .unlockedBy("gold", has(Tags.Items.INGOTS_GOLD)); @@ -1508,7 +1508,7 @@ private static void createDiamondGauntlet(ItemLike gauntletItem) { createGauntlet(builder, Tags.Items.GEMS_DIAMOND); } - private static void createWoodPike(ItemLike pikeItem, ItemLike pikeHead) { + private static void createWoodenPike(ItemLike pikeItem, ItemLike pikeHead) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(pikeItem) .group("wood") .unlockedBy("planks", has(ItemTags.PLANKS)); @@ -1522,7 +1522,7 @@ private static void createStonePike(ItemLike pikeItem, ItemLike pikeHead) { createPike(builder, ItemTags.STONE_TOOL_MATERIALS, pikeHead); } - private static void createGoldPike(ItemLike pikeItem, ItemLike pikeHead) { + private static void createGoldenPike(ItemLike pikeItem, ItemLike pikeHead) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(pikeItem) .group("gold") .unlockedBy("gold", has(Tags.Items.INGOTS_GOLD)); @@ -1543,11 +1543,11 @@ private static void createDiamondPike(ItemLike pikeItem, ItemLike pikeHead) { createPike(builder, Tags.Items.GEMS_DIAMOND, pikeHead); } - private static void createWoodPikeHead(ItemLike pikeHeadItem) { + private static void createWoodenPikeHead(ItemLike pikeHeadItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(pikeHeadItem) .group("wood") .unlockedBy("planks", has(ItemTags.PLANKS)); - createPikeHead(builder, ItemTags.PLANKS, ImmersiveWeaponsItemTagGroups.WOOD_SHARDS); + createPikeHead(builder, ItemTags.PLANKS, ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS); } private static void createStonePikeHead(ItemLike pikeHeadItem) { @@ -1557,7 +1557,7 @@ private static void createStonePikeHead(ItemLike pikeHeadItem) { createPikeHead(builder, ItemTags.STONE_TOOL_MATERIALS, ImmersiveWeaponsItemTagGroups.STONE_SHARDS); } - private static void createGoldPikeHead(ItemLike pikeHeadItem) { + private static void createGoldenPikeHead(ItemLike pikeHeadItem) { ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(pikeHeadItem) .group("gold") .unlockedBy("gold", has(Tags.Items.INGOTS_GOLD)); @@ -2036,7 +2036,7 @@ private static void createGauntlet(ShapedRecipeBuilder builder, TagKey mat private static void createPike(ShapedRecipeBuilder builder, TagKey material, ItemLike pikeHead) { builder.define('a', pikeHead) .define('b', material) - .define('c', DeferredRegistryHandler.WOOD_TOOL_ROD.get()) + .define('c', DeferredRegistryHandler.WOODEN_TOOL_ROD.get()) .pattern(" a ") .pattern(" b ") .pattern(" c ") @@ -2101,52 +2101,52 @@ private static void createNuggetFromIngot(ShapelessRecipeBuilder builder, TagKey .save(finishedRecipeConsumer); } - private static void createSmokeBomb(ItemLike smokeBombItem) { - ShapedRecipeBuilder.shaped(smokeBombItem, 2) + private static void createSmokeGrenade(ItemLike smokeGrenadeItem) { + ShapedRecipeBuilder.shaped(smokeGrenadeItem, 2) .define('a', Items.BAMBOO) - .define('b', DeferredRegistryHandler.SMALL_PARTS_METAL_THROWABLE_BOMB.get()) + .define('b', DeferredRegistryHandler.GRENADE_ASSEMBLY.get()) .define('c', DeferredRegistryHandler.SMOKE_POWDER.get()) .pattern(" cb") .pattern(" a ") .pattern(" a ") - .group("smoke_bomb") + .group("smoke_grenade") .unlockedBy("smoke_powder", has(DeferredRegistryHandler.SMOKE_POWDER.get())) .save(finishedRecipeConsumer); } - private static void createColoredSmokeBomb(ItemLike smokeBombItem, TagKey colorTag) { - ShapedRecipeBuilder.shaped(smokeBombItem, 2) + private static void createColoredSmokeGrenade(ItemLike smokeGrenadeItem, TagKey colorTag) { + ShapedRecipeBuilder.shaped(smokeGrenadeItem, 2) .define('a', Items.BAMBOO) - .define('b', DeferredRegistryHandler.SMALL_PARTS_METAL_THROWABLE_BOMB.get()) + .define('b', DeferredRegistryHandler.GRENADE_ASSEMBLY.get()) .define('c', DeferredRegistryHandler.SMOKE_POWDER.get()) .define('d', colorTag) .pattern("dcb") .pattern(" a ") .pattern(" a ") - .group("smoke_bomb") + .group("smoke_grenade") .unlockedBy("smoke_powder", has(DeferredRegistryHandler.SMOKE_POWDER.get())) .save(finishedRecipeConsumer); } - private static void createSmokeBombArrow(ItemLike arrowItem) { + private static void createSmokeGrenadeArrow(ItemLike arrowItem) { ShapedRecipeBuilder.shaped(arrowItem, 4) .define('a', Items.ARROW) .define('b', DeferredRegistryHandler.SMOKE_POWDER.get()) .pattern("aab") .pattern("aa ") - .group("smoke_bomb") + .group("smoke_grenade") .unlockedBy("smoke_powder", has(DeferredRegistryHandler.SMOKE_POWDER.get())) .save(finishedRecipeConsumer); } - private static void createColoredSmokeBombArrow(ItemLike arrowItem, TagKey colorTag) { + private static void createColoredSmokeGrenadeArrow(ItemLike arrowItem, TagKey colorTag) { ShapedRecipeBuilder.shaped(arrowItem, 4) .define('a', Items.ARROW) .define('b', DeferredRegistryHandler.SMOKE_POWDER.get()) .define('c', colorTag) .pattern("aab") .pattern("aac") - .group("smoke_bomb") + .group("smoke_grenade") .unlockedBy("smoke_powder", has(DeferredRegistryHandler.SMOKE_POWDER.get())) .save(finishedRecipeConsumer); } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/ItemTagsGenerator.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/ItemTagsGenerator.java index 7f6f1d652..b99057f78 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/ItemTagsGenerator.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/ItemTagsGenerator.java @@ -105,7 +105,7 @@ private void addImmersiveWeaponsTags() { tag(ImmersiveWeaponsItemTagGroups.VENTUS_SHARDS).add(DeferredRegistryHandler.VENTUS_SHARD.get()); tag(ImmersiveWeaponsItemTagGroups.DIAMOND_SHARDS).add(DeferredRegistryHandler.DIAMOND_SHARD.get()); tag(ImmersiveWeaponsItemTagGroups.STONE_SHARDS).add(DeferredRegistryHandler.STONE_SHARD.get()); - tag(ImmersiveWeaponsItemTagGroups.WOOD_SHARDS).add(DeferredRegistryHandler.WOOD_SHARD.get()); + tag(ImmersiveWeaponsItemTagGroups.WOODEN_SHARDS).add(DeferredRegistryHandler.WOODEN_SHARD.get()); } /** diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/groups/immersiveweapons/ImmersiveWeaponsItemTagGroups.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/groups/immersiveweapons/ImmersiveWeaponsItemTagGroups.java index ff01e6007..5772cde35 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/groups/immersiveweapons/ImmersiveWeaponsItemTagGroups.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/groups/immersiveweapons/ImmersiveWeaponsItemTagGroups.java @@ -28,6 +28,6 @@ public class ImmersiveWeaponsItemTagGroups { "shards/diamond")); public static final TagKey STONE_SHARDS = ItemTags.create(new ResourceLocation(ImmersiveWeapons.MOD_ID, "shards/stone")); - public static final TagKey WOOD_SHARDS = ItemTags.create(new ResourceLocation(ImmersiveWeapons.MOD_ID, + public static final TagKey WOODEN_SHARDS = ItemTags.create(new ResourceLocation(ImmersiveWeapons.MOD_ID, "shards/wood")); } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/lists/ItemTagLists.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/lists/ItemTagLists.java index 460cef206..c66fb1cdf 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/lists/ItemTagLists.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/data/tags/lists/ItemTagLists.java @@ -20,30 +20,30 @@ public static void init() { } private static void addMusketBalls() { - MUSKET_BALLS.add(DeferredRegistryHandler.WOOD_MUSKET_BALL.get()); + MUSKET_BALLS.add(DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.STONE_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.COPPER_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.IRON_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.COBALT_MUSKET_BALL.get()); - MUSKET_BALLS.add(DeferredRegistryHandler.GOLD_MUSKET_BALL.get()); + MUSKET_BALLS.add(DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.DIAMOND_MUSKET_BALL.get()); MUSKET_BALLS.add(DeferredRegistryHandler.NETHERITE_MUSKET_BALL.get()); } private static void addArrows() { - ARROWS.add(DeferredRegistryHandler.WOOD_ARROW.get()); + ARROWS.add(DeferredRegistryHandler.WOODEN_ARROW.get()); ARROWS.add(DeferredRegistryHandler.STONE_ARROW.get()); ARROWS.add(DeferredRegistryHandler.COPPER_ARROW.get()); ARROWS.add(DeferredRegistryHandler.IRON_ARROW.get()); ARROWS.add(DeferredRegistryHandler.COBALT_ARROW.get()); - ARROWS.add(DeferredRegistryHandler.GOLD_ARROW.get()); + ARROWS.add(DeferredRegistryHandler.GOLDEN_ARROW.get()); ARROWS.add(DeferredRegistryHandler.DIAMOND_ARROW.get()); ARROWS.add(DeferredRegistryHandler.NETHERITE_ARROW.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE.get()); - ARROWS.add(DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get()); + ARROWS.add(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get()); } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/BulletEntities.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/BulletEntities.java index 9a0eb45f0..1f8e15e5f 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/BulletEntities.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/BulletEntities.java @@ -22,7 +22,7 @@ public class BulletEntities { - public static class WoodBulletEntity extends BulletEntity { + public static class WoodenMusketBallEntity extends BulletEntity { /** * Constructor for WoodBulletEntity. * @@ -30,10 +30,10 @@ public static class WoodBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public WoodBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public WoodenMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; - referenceItem = DeferredRegistryHandler.WOOD_MUSKET_BALL.get(); + referenceItem = DeferredRegistryHandler.WOODEN_MUSKET_BALL.get(); } /** @@ -43,8 +43,8 @@ public WoodBulletEntity(EntityType entityType, Level world, in * @param world the World the entity is in * @param referenceItemIn the reference item */ - public WoodBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.WOOD_BULLET_ENTITY.get(), shooter, world); + public WoodenMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.WOODEN_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -74,7 +74,7 @@ public double getGravityModifier() { } } - public static class StoneBulletEntity extends BulletEntity { + public static class StoneMusketBallEntity extends BulletEntity { /** * Constructor for StoneBulletEntity. * @@ -82,7 +82,7 @@ public static class StoneBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public StoneBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public StoneMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.STONE_MUSKET_BALL.get(); @@ -95,8 +95,8 @@ public StoneBulletEntity(EntityType entityType, Level world, * @param world the World the entity is in * @param referenceItemIn the reference item */ - public StoneBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.STONE_BULLET_ENTITY.get(), shooter, world); + public StoneMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.STONE_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -126,7 +126,7 @@ public double getGravityModifier() { } } - public static class GoldBulletEntity extends BulletEntity { + public static class GoldenMusketBallEntity extends BulletEntity { /** * Constructor for GoldBulletEntity. * @@ -134,10 +134,10 @@ public static class GoldBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public GoldBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public GoldenMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; - referenceItem = DeferredRegistryHandler.GOLD_MUSKET_BALL.get(); + referenceItem = DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get(); } /** @@ -147,8 +147,8 @@ public GoldBulletEntity(EntityType entityType, Level world, in * @param world the World the entity is in * @param referenceItemIn the reference item */ - public GoldBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.GOLD_BULLET_ENTITY.get(), shooter, world); + public GoldenMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.GOLDEN_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -178,7 +178,7 @@ public double getGravityModifier() { } } - public static class CopperBulletEntity extends BulletEntity { + public static class CopperMusketBallEntity extends BulletEntity { /** * Constructor for CopperBulletEntity. @@ -187,7 +187,7 @@ public static class CopperBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public CopperBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public CopperMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.COPPER_MUSKET_BALL.get(); @@ -200,8 +200,8 @@ public CopperBulletEntity(EntityType entityType, Level world * @param world the World the entity is in * @param referenceItemIn the reference item */ - public CopperBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.COPPER_BULLET_ENTITY.get(), shooter, world); + public CopperMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.COPPER_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -231,7 +231,7 @@ public double getGravityModifier() { } } - public static class IronBulletEntity extends BulletEntity { + public static class IronMusketBallEntity extends BulletEntity { /** * Constructor for IronBulletEntity. * @@ -239,7 +239,7 @@ public static class IronBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public IronBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public IronMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.IRON_MUSKET_BALL.get(); @@ -252,8 +252,8 @@ public IronBulletEntity(EntityType entityType, Level world, in * @param world the World the entity is in * @param referenceItemIn the reference item */ - public IronBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.IRON_BULLET_ENTITY.get(), shooter, world); + public IronMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.IRON_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -283,7 +283,7 @@ public double getGravityModifier() { } } - public static class CobaltBulletEntity extends BulletEntity { + public static class CobaltMusketBallEntity extends BulletEntity { /** * Constructor for CobaltBulletEntity. * @@ -291,7 +291,7 @@ public static class CobaltBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public CobaltBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public CobaltMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.COBALT_MUSKET_BALL.get(); @@ -304,8 +304,8 @@ public CobaltBulletEntity(EntityType entityType, Level world * @param world the World the entity is in * @param referenceItemIn the reference item */ - public CobaltBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.COBALT_BULLET_ENTITY.get(), shooter, world); + public CobaltMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.COBALT_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -335,7 +335,7 @@ public double getGravityModifier() { } } - public static class DiamondBulletEntity extends BulletEntity { + public static class DiamondMusketBallEntity extends BulletEntity { /** * Constructor for DiamondBulletEntity. * @@ -343,7 +343,7 @@ public static class DiamondBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public DiamondBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public DiamondMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.DIAMOND_MUSKET_BALL.get(); @@ -356,8 +356,8 @@ public DiamondBulletEntity(EntityType entityType, Level wor * @param world the World the entity is in * @param referenceItemIn the reference item */ - public DiamondBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.DIAMOND_BULLET_ENTITY.get(), shooter, world); + public DiamondMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.DIAMOND_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -392,7 +392,7 @@ public void shoot(double x, double y, double z, float velocity, float inaccuracy } } - public static class NetheriteBulletEntity extends BulletEntity { + public static class NetheriteMusketBallEntity extends BulletEntity { /** * Constructor for NetheriteBulletEntity. * @@ -400,7 +400,7 @@ public static class NetheriteBulletEntity extends BulletEntity { * @param world the World the entity is in * @param knockbackStrength the bullet knockback strength */ - public NetheriteBulletEntity(EntityType entityType, Level world, int knockbackStrength) { + public NetheriteMusketBallEntity(EntityType entityType, Level world, int knockbackStrength) { super(entityType, world); this.knockbackStrength = knockbackStrength; referenceItem = DeferredRegistryHandler.NETHERITE_MUSKET_BALL.get(); @@ -413,8 +413,8 @@ public NetheriteBulletEntity(EntityType entityType, Level * @param world the World the entity is in * @param referenceItemIn the reference item */ - public NetheriteBulletEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.NETHERITE_BULLET_ENTITY.get(), shooter, world); + public NetheriteMusketBallEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.NETHERITE_MUSKET_BALL_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/CustomArrowEntity.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/CustomArrowEntity.java index 9decc917d..86aa1f690 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/CustomArrowEntity.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/CustomArrowEntity.java @@ -1,6 +1,6 @@ package com.anonymoushacker1279.immersiveweapons.entity.projectile; -import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb.SmokeBombParticleOptions; +import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade.SmokeGrenadeParticleOptions; import com.anonymoushacker1279.immersiveweapons.config.CommonConfig; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import com.anonymoushacker1279.immersiveweapons.init.PacketHandler; @@ -182,7 +182,7 @@ public DiamondArrowEntity(Level worldIn, double x, double y, double z) { } } - public static class GoldArrowEntity extends AbstractCustomArrowEntity { + public static class GoldenArrowEntity extends AbstractCustomArrowEntity { /** * Constructor for GoldArrowEntity. @@ -190,9 +190,9 @@ public static class GoldArrowEntity extends AbstractCustomArrowEntity { * @param type the EntityType instance; must extend AbstractArrowEntity * @param world the World the entity is in */ - public GoldArrowEntity(EntityType type, Level world) { + public GoldenArrowEntity(EntityType type, Level world) { super(type, world); - referenceItem = DeferredRegistryHandler.GOLD_ARROW.get(); + referenceItem = DeferredRegistryHandler.GOLDEN_ARROW.get(); } /** @@ -202,8 +202,8 @@ public GoldArrowEntity(EntityType type, Level world) { * @param world the World the entity is in * @param referenceItemIn the reference item */ - public GoldArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.GOLD_ARROW_ENTITY.get(), shooter, world); + public GoldenArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.GOLDEN_ARROW_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -215,9 +215,9 @@ public GoldArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) * @param y the Y position * @param z the Z position */ - public GoldArrowEntity(Level worldIn, double x, double y, double z) { - super(DeferredRegistryHandler.GOLD_ARROW_ENTITY.get(), worldIn, x, y, z); - referenceItem = DeferredRegistryHandler.GOLD_ARROW.get(); + public GoldenArrowEntity(Level worldIn, double x, double y, double z) { + super(DeferredRegistryHandler.GOLDEN_ARROW_ENTITY.get(), worldIn, x, y, z); + referenceItem = DeferredRegistryHandler.GOLDEN_ARROW.get(); } } @@ -280,7 +280,7 @@ public void shoot(double x, double y, double z, float velocity, float inaccuracy } } - public static class WoodArrowEntity extends AbstractCustomArrowEntity { + public static class WoodenArrowEntity extends AbstractCustomArrowEntity { /** * Constructor for WoodArrowEntity. @@ -288,9 +288,9 @@ public static class WoodArrowEntity extends AbstractCustomArrowEntity { * @param type the EntityType instance; must extend AbstractArrowEntity * @param world the World the entity is in */ - public WoodArrowEntity(EntityType type, Level world) { + public WoodenArrowEntity(EntityType type, Level world) { super(type, world); - referenceItem = DeferredRegistryHandler.WOOD_ARROW.get(); + referenceItem = DeferredRegistryHandler.WOODEN_ARROW.get(); } /** @@ -300,8 +300,8 @@ public WoodArrowEntity(EntityType type, Level world) { * @param world the World the entity is in * @param referenceItemIn the reference item */ - public WoodArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.WOOD_ARROW_ENTITY.get(), shooter, world); + public WoodenArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.WOODEN_ARROW_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -313,9 +313,9 @@ public WoodArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) * @param y the Y position * @param z the Z position */ - public WoodArrowEntity(Level worldIn, double x, double y, double z) { - super(DeferredRegistryHandler.WOOD_ARROW_ENTITY.get(), worldIn, x, y, z); - referenceItem = DeferredRegistryHandler.WOOD_ARROW.get(); + public WoodenArrowEntity(Level worldIn, double x, double y, double z) { + super(DeferredRegistryHandler.WOODEN_ARROW_ENTITY.get(), worldIn, x, y, z); + referenceItem = DeferredRegistryHandler.WOODEN_ARROW.get(); } /** @@ -402,32 +402,32 @@ public double getMovementModifier() { } } - public static class SmokeBombArrowEntity extends AbstractCustomArrowEntity { + public static class SmokeGrenadeArrowEntity extends AbstractCustomArrowEntity { private static int color = 0; - private final int configMaxParticles = CommonConfig.MAX_SMOKE_BOMB_PARTICLES.get(); + private final int configMaxParticles = CommonConfig.MAX_SMOKE_GRENADE_PARTICLES.get(); private static final byte VANILLA_IMPACT_STATUS_ID = 3; /** - * Constructor for SmokeBombArrowEntity. + * Constructor for SmokeGrenadeArrowEntity. * * @param type the EntityType instance; must extend AbstractArrowEntity * @param world the World the entity is in */ - public SmokeBombArrowEntity(EntityType type, Level world) { + public SmokeGrenadeArrowEntity(EntityType type, Level world) { super(type, world); - referenceItem = DeferredRegistryHandler.SMOKE_BOMB_ARROW.get(); + referenceItem = DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get(); } /** - * Constructor for SmokeBombArrowEntity. + * Constructor for SmokeGrenadeArrowEntity. * * @param shooter the LivingEntity shooting the entity * @param world the World the entity is in * @param referenceItemIn the reference item */ - public SmokeBombArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { - super(DeferredRegistryHandler.SMOKE_BOMB_ARROW_ENTITY.get(), shooter, world); + public SmokeGrenadeArrowEntity(LivingEntity shooter, Level world, Item referenceItemIn) { + super(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_ENTITY.get(), shooter, world); referenceItem = referenceItemIn; } @@ -439,9 +439,9 @@ public SmokeBombArrowEntity(LivingEntity shooter, Level world, Item referenceIte * @param y the Y position * @param z the Z position */ - public SmokeBombArrowEntity(Level worldIn, double x, double y, double z) { - super(DeferredRegistryHandler.SMOKE_BOMB_ARROW_ENTITY.get(), worldIn, x, y, z); - referenceItem = DeferredRegistryHandler.SMOKE_BOMB_ARROW.get(); + public SmokeGrenadeArrowEntity(Level worldIn, double x, double y, double z) { + super(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_ENTITY.get(), worldIn, x, y, z); + referenceItem = DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get(); } /** @@ -450,7 +450,7 @@ public SmokeBombArrowEntity(Level worldIn, double x, double y, double z) { * @param color an integer representing the color */ public static void setColor(int color) { - SmokeBombArrowEntity.color = color; + SmokeGrenadeArrowEntity.color = color; } /** @@ -463,7 +463,7 @@ public void onHit(@NotNull HitResult rayTraceResult) { super.onHit(rayTraceResult); if (!level.isClientSide) { PacketHandler.INSTANCE.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(blockPosition())), - new SmokeBombArrowEntityPacketHandler(color)); + new SmokeGrenadeArrowEntityPacketHandler(color)); level.broadcastEntityEvent(this, VANILLA_IMPACT_STATUS_ID); } @@ -483,7 +483,7 @@ public void handleEntityEvent(byte statusID) { // Spawn smoke particles for (int i = 0; i < configMaxParticles; ++i) { - level.addParticle(SmokeBombParticleOptions.getParticleByColor(color), + level.addParticle(SmokeGrenadeParticleOptions.getParticleByColor(color), true, x, y, z, GeneralUtilities.getRandomNumber(-0.1d, 0.1d), GeneralUtilities.getRandomNumber(-0.1d, 0.1d), @@ -491,29 +491,29 @@ public void handleEntityEvent(byte statusID) { } // Play a hissing sound - level.playLocalSound(x, y, z, DeferredRegistryHandler.SMOKE_BOMB_HISS.get(), + level.playLocalSound(x, y, z, DeferredRegistryHandler.SMOKE_GRENADE_HISS.get(), SoundSource.NEUTRAL, 0.2f, 0.6f, true); } } } - public record SmokeBombArrowEntityPacketHandler(int color) { + public record SmokeGrenadeArrowEntityPacketHandler(int color) { /** - * Constructor for SmokeBombArrowEntityPacketHandler. + * Constructor for SmokeGrenadeArrowEntityPacketHandler. * * @param color the color ID */ - public SmokeBombArrowEntityPacketHandler { + public SmokeGrenadeArrowEntityPacketHandler { } /** * Encodes a packet * - * @param msg the SmokeBombArrowEntityPacketHandler message being sent + * @param msg the SmokeGrenadeArrowEntityPacketHandler message being sent * @param packetBuffer the PacketBuffer containing packet data */ - public static void encode(SmokeBombArrowEntityPacketHandler msg, FriendlyByteBuf packetBuffer) { + public static void encode(SmokeGrenadeArrowEntityPacketHandler msg, FriendlyByteBuf packetBuffer) { packetBuffer.writeInt(msg.color); } @@ -521,19 +521,19 @@ public static void encode(SmokeBombArrowEntityPacketHandler msg, FriendlyByteBuf * Decodes a packet * * @param packetBuffer the PacketBuffer containing packet data - * @return SmokeBombArrowEntityPacketHandler + * @return SmokeGrenadeArrowEntityPacketHandler */ - public static SmokeBombArrowEntityPacketHandler decode(FriendlyByteBuf packetBuffer) { - return new SmokeBombArrowEntityPacketHandler(packetBuffer.readInt()); + public static SmokeGrenadeArrowEntityPacketHandler decode(FriendlyByteBuf packetBuffer) { + return new SmokeGrenadeArrowEntityPacketHandler(packetBuffer.readInt()); } /** * Handles an incoming packet, by sending it to the client/server * - * @param msg the SmokeBombArrowEntityPacketHandler message being sent + * @param msg the SmokeGrenadeArrowEntityPacketHandler message being sent * @param contextSupplier the Supplier providing context */ - public static void handle(SmokeBombArrowEntityPacketHandler msg, Supplier contextSupplier) { + public static void handle(SmokeGrenadeArrowEntityPacketHandler msg, Supplier contextSupplier) { NetworkEvent.Context context = contextSupplier.get(); context.enqueueWork(() -> DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> handleOnClient(msg))); context.setPacketHandled(true); @@ -542,10 +542,10 @@ public static void handle(SmokeBombArrowEntityPacketHandler msg, SupplierSmokeBombArrowEntityPacketHandler message being sent + * @param msg the SmokeGrenadeArrowEntityPacketHandler message being sent */ - private static void handleOnClient(SmokeBombArrowEntityPacketHandler msg) { - SmokeBombArrowEntity.setColor(msg.color); + private static void handleOnClient(SmokeGrenadeArrowEntityPacketHandler msg) { + SmokeGrenadeArrowEntity.setColor(msg.color); } } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeBombEntity.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeGrenadeEntity.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeBombEntity.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeGrenadeEntity.java index efd56da0c..26d21604e 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeBombEntity.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/entity/projectile/SmokeGrenadeEntity.java @@ -1,6 +1,6 @@ package com.anonymoushacker1279.immersiveweapons.entity.projectile; -import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb.SmokeBombParticleOptions; +import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade.SmokeGrenadeParticleOptions; import com.anonymoushacker1279.immersiveweapons.config.CommonConfig; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import com.anonymoushacker1279.immersiveweapons.init.PacketHandler; @@ -22,42 +22,42 @@ import java.util.function.Supplier; -public class SmokeBombEntity extends ThrowableItemProjectile { +public class SmokeGrenadeEntity extends ThrowableItemProjectile { private static final byte VANILLA_IMPACT_STATUS_ID = 3; private static int color; - private final int configMaxParticles = CommonConfig.MAX_SMOKE_BOMB_PARTICLES.get(); + private final int configMaxParticles = CommonConfig.MAX_SMOKE_GRENADE_PARTICLES.get(); /** * Constructor for SmokeBombEntity. * - * @param entityType the EntityType instance; must extend SmokeBombEntity + * @param entityType the EntityType instance; must extend SmokeGrenadeEntity * @param world the World the entity is in */ - public SmokeBombEntity(EntityType entityType, Level world) { + public SmokeGrenadeEntity(EntityType entityType, Level world) { super(entityType, world); } /** - * Constructor for SmokeBombEntity. + * Constructor for SmokeGrenadeEntity. * * @param world the World the entity is in * @param livingEntity the LivingEntity throwing the entity */ - public SmokeBombEntity(Level world, LivingEntity livingEntity) { - super(DeferredRegistryHandler.SMOKE_BOMB_ENTITY.get(), livingEntity, world); + public SmokeGrenadeEntity(Level world, LivingEntity livingEntity) { + super(DeferredRegistryHandler.SMOKE_GRENADE_ENTITY.get(), livingEntity, world); } /** - * Constructor for SmokeBombEntity. + * Constructor for SmokeGrenadeEntity. * * @param world the World the entity is in * @param x the X position * @param y the Y position * @param z the Z position */ - public SmokeBombEntity(Level world, double x, double y, double z) { - super(DeferredRegistryHandler.SMOKE_BOMB_ENTITY.get(), x, y, z, world); + public SmokeGrenadeEntity(Level world, double x, double y, double z) { + super(DeferredRegistryHandler.SMOKE_GRENADE_ENTITY.get(), x, y, z, world); } /** @@ -66,7 +66,7 @@ public SmokeBombEntity(Level world, double x, double y, double z) { * @param color a color ID */ public static void setColor(int color) { - SmokeBombEntity.color = color; + SmokeGrenadeEntity.color = color; } /** @@ -87,7 +87,7 @@ public static void setColor(int color) { */ @Override protected @NotNull Item getDefaultItem() { - return DeferredRegistryHandler.SMOKE_BOMB.get(); + return DeferredRegistryHandler.SMOKE_GRENADE.get(); } /** @@ -101,7 +101,7 @@ protected void onHit(@NotNull HitResult rayTraceResult) { if (!level.isClientSide) { // Inform the client of the smoke bomb color PacketHandler.INSTANCE.send(PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(blockPosition())), - new SmokeBombEntityPacketHandler(color)); + new SmokeGrenadeEntityPacketHandler(color)); level.broadcastEntityEvent(this, VANILLA_IMPACT_STATUS_ID); kill(); @@ -122,7 +122,7 @@ public void handleEntityEvent(byte statusID) { // Spawn smoke particles for (int i = 0; i < configMaxParticles; ++i) { - level.addParticle(SmokeBombParticleOptions.getParticleByColor(color), + level.addParticle(SmokeGrenadeParticleOptions.getParticleByColor(color), true, x, y, z, GeneralUtilities.getRandomNumber(-0.1d, 0.1d), GeneralUtilities.getRandomNumber(-0.1d, 0.1d), @@ -130,30 +130,30 @@ public void handleEntityEvent(byte statusID) { } // Play a hissing sound - level.playLocalSound(x, y, z, DeferredRegistryHandler.SMOKE_BOMB_HISS.get(), + level.playLocalSound(x, y, z, DeferredRegistryHandler.SMOKE_GRENADE_HISS.get(), SoundSource.NEUTRAL, 0.2f, 0.6f, true); kill(); } } - public record SmokeBombEntityPacketHandler(int color) { + public record SmokeGrenadeEntityPacketHandler(int color) { /** - * Constructor for SmokeBombEntityPacketHandler. + * Constructor for SmokeGrenadeEntityPacketHandler. * * @param color the color ID */ - public SmokeBombEntityPacketHandler { + public SmokeGrenadeEntityPacketHandler { } /** * Encodes a packet * - * @param msg the SmokeBombEntityPacketHandler message being sent + * @param msg the SmokeGrenadeEntityPacketHandler message being sent * @param packetBuffer the PacketBuffer containing packet data */ - public static void encode(SmokeBombEntityPacketHandler msg, FriendlyByteBuf packetBuffer) { + public static void encode(SmokeGrenadeEntityPacketHandler msg, FriendlyByteBuf packetBuffer) { packetBuffer.writeInt(msg.color); } @@ -161,19 +161,19 @@ public static void encode(SmokeBombEntityPacketHandler msg, FriendlyByteBuf pack * Decodes a packet * * @param packetBuffer the PacketBuffer containing packet data - * @return SmokeBombEntityPacketHandler + * @return SmokeGrenadeEntityPacketHandler */ - public static SmokeBombEntityPacketHandler decode(FriendlyByteBuf packetBuffer) { - return new SmokeBombEntityPacketHandler(packetBuffer.readInt()); + public static SmokeGrenadeEntityPacketHandler decode(FriendlyByteBuf packetBuffer) { + return new SmokeGrenadeEntityPacketHandler(packetBuffer.readInt()); } /** * Handles an incoming packet, by sending it to the client/server * - * @param msg the SmokeBombEntityPacketHandler message being sent + * @param msg the SmokeGrenadeEntityPacketHandler message being sent * @param contextSupplier the Supplier providing context */ - public static void handle(SmokeBombEntityPacketHandler msg, Supplier contextSupplier) { + public static void handle(SmokeGrenadeEntityPacketHandler msg, Supplier contextSupplier) { NetworkEvent.Context context = contextSupplier.get(); context.enqueueWork(() -> DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> handleOnClient(msg))); context.setPacketHandled(true); @@ -182,10 +182,10 @@ public static void handle(SmokeBombEntityPacketHandler msg, Supplier co /** * Runs specifically on the client, when a packet is received * - * @param msg the SmokeBombEntityPacketHandler message being sent + * @param msg the SmokeGrenadeEntityPacketHandler message being sent */ - private static void handleOnClient(SmokeBombEntityPacketHandler msg) { - SmokeBombEntity.setColor(msg.color); + private static void handleOnClient(SmokeGrenadeEntityPacketHandler msg) { + SmokeGrenadeEntity.setColor(msg.color); } } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ClientModEventSubscriber.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ClientModEventSubscriber.java index 41ece3d33..a652cac48 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ClientModEventSubscriber.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ClientModEventSubscriber.java @@ -11,7 +11,7 @@ import com.anonymoushacker1279.immersiveweapons.client.particle.BloodParticle; import com.anonymoushacker1279.immersiveweapons.client.particle.MuzzleFlashParticle; import com.anonymoushacker1279.immersiveweapons.client.particle.bullet_impact.BulletImpactParticle; -import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb.SmokeBombParticle; +import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade.SmokeGrenadeParticle; import com.anonymoushacker1279.immersiveweapons.client.renderer.blockentity.ChairRenderer; import com.anonymoushacker1279.immersiveweapons.client.renderer.blockentity.ShelfRenderer; import com.anonymoushacker1279.immersiveweapons.client.renderer.dimension.TiltrosDimensionSpecialEffects; @@ -156,13 +156,13 @@ public static void onClientSetup(FMLClientSetupEvent event) { */ @SubscribeEvent public static void entityRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerEntityRenderer(DeferredRegistryHandler.WOOD_ARROW_ENTITY.get(), context -> + event.registerEntityRenderer(DeferredRegistryHandler.WOODEN_ARROW_ENTITY.get(), context -> new CustomArrowRenderer<>(context, new ResourceLocation(ImmersiveWeapons.MOD_ID, "textures/entity/projectiles/wood_arrow.png"))); event.registerEntityRenderer(DeferredRegistryHandler.STONE_ARROW_ENTITY.get(), context -> new CustomArrowRenderer<>(context, new ResourceLocation(ImmersiveWeapons.MOD_ID, "textures/entity/projectiles/stone_arrow.png"))); - event.registerEntityRenderer(DeferredRegistryHandler.GOLD_ARROW_ENTITY.get(), context -> + event.registerEntityRenderer(DeferredRegistryHandler.GOLDEN_ARROW_ENTITY.get(), context -> new CustomArrowRenderer<>(context, new ResourceLocation(ImmersiveWeapons.MOD_ID, "textures/entity/projectiles/gold_arrow.png"))); event.registerEntityRenderer(DeferredRegistryHandler.COPPER_ARROW_ENTITY.get(), context -> @@ -180,20 +180,20 @@ public static void entityRenderers(EntityRenderersEvent.RegisterRenderers event) event.registerEntityRenderer(DeferredRegistryHandler.NETHERITE_ARROW_ENTITY.get(), context -> new CustomArrowRenderer<>(context, new ResourceLocation(ImmersiveWeapons.MOD_ID, "textures/entity/projectiles/netherite_arrow.png"))); - event.registerEntityRenderer(DeferredRegistryHandler.SMOKE_BOMB_ARROW_ENTITY.get(), context -> + event.registerEntityRenderer(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_ENTITY.get(), context -> new CustomArrowRenderer<>(context, new ResourceLocation(ImmersiveWeapons.MOD_ID, "textures/entity/projectiles/smoke_bomb_arrow.png"))); - event.registerEntityRenderer(DeferredRegistryHandler.WOOD_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.STONE_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.GOLD_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.COPPER_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.IRON_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.COBALT_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.DIAMOND_BULLET_ENTITY.get(), MusketBallRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.NETHERITE_BULLET_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.WOODEN_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.STONE_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.GOLDEN_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.COPPER_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.IRON_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.COBALT_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.DIAMOND_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.NETHERITE_MUSKET_BALL_ENTITY.get(), MusketBallRenderer::new); event.registerEntityRenderer(DeferredRegistryHandler.FLARE_ENTITY.get(), FlareRenderer::new); event.registerEntityRenderer(DeferredRegistryHandler.MORTAR_SHELL_ENTITY.get(), ThrownItemRenderer::new); - event.registerEntityRenderer(DeferredRegistryHandler.SMOKE_BOMB_ENTITY.get(), ThrownItemRenderer::new); + event.registerEntityRenderer(DeferredRegistryHandler.SMOKE_GRENADE_ENTITY.get(), ThrownItemRenderer::new); event.registerEntityRenderer(DeferredRegistryHandler.MOLOTOV_COCKTAIL_ENTITY.get(), ThrownItemRenderer::new); event.registerEntityRenderer(DeferredRegistryHandler.DYING_SOLDIER_ENTITY.get(), DyingSoldierRenderer::new); event.registerEntityRenderer(DeferredRegistryHandler.MINUTEMAN_ENTITY.get(), MinutemanRenderer::new); @@ -233,7 +233,7 @@ public static void registerLayers(EntityRenderersEvent.RegisterLayerDefinitions */ @SubscribeEvent public static void onParticleFactoryRegistration(ParticleFactoryRegisterEvent event) { - mc.particleEngine.register(DeferredRegistryHandler.SMOKE_BOMB_PARTICLE.get(), SmokeBombParticle.Provider::new); + mc.particleEngine.register(DeferredRegistryHandler.SMOKE_GRENADE_PARTICLE.get(), SmokeGrenadeParticle.Provider::new); mc.particleEngine.register(DeferredRegistryHandler.BLOOD_PARTICLE.get(), BloodParticle.Provider::new); mc.particleEngine.register(DeferredRegistryHandler.BULLET_IMPACT_PARTICLE.get(), BulletImpactParticle.Provider::new); mc.particleEngine.register(DeferredRegistryHandler.MUZZLE_FLASH_PARTICLE.get(), MuzzleFlashParticle.Provider::new); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ForgeEventSubscriber.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ForgeEventSubscriber.java index 3ffa81704..5c70f6a15 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ForgeEventSubscriber.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ForgeEventSubscriber.java @@ -2,19 +2,27 @@ import com.anonymoushacker1279.immersiveweapons.ImmersiveWeapons; import com.anonymoushacker1279.immersiveweapons.config.CommonConfig; +import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import com.anonymoushacker1279.immersiveweapons.world.level.levelgen.OreGeneratorHandler; +import com.google.common.collect.ImmutableList; import net.minecraft.core.Holder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.Item; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraftforge.common.world.BiomeGenerationSettingsBuilder; +import net.minecraftforge.event.RegistryEvent.MissingMappings; +import net.minecraftforge.event.RegistryEvent.MissingMappings.Mapping; import net.minecraftforge.event.world.BiomeLoadingEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; -import java.util.Objects; +import java.util.*; @EventBusSubscriber(modid = ImmersiveWeapons.MOD_ID, bus = Bus.FORGE) public class ForgeEventSubscriber { @@ -64,4 +72,244 @@ public static void onBiomeLoading(BiomeLoadingEvent event) { } } } + + /** + * Event handler for the MissingMappings (Item) event. + * Migrates old registry names to newer ones. + * + * @param event the MissingMappings instance + */ + @SubscribeEvent + public static void missingItemMappings(MissingMappings event) { + ImmutableList> mappings = event.getMappings(ImmersiveWeapons.MOD_ID); + + if (!mappings.isEmpty()) { + + ImmersiveWeapons.LOGGER.warn("Missing item mappings were found. This probably means an item was renamed or deleted. Attempting to remap..."); + + List remappedItems = new ArrayList<>(0); + + ResourceLocation SMALL_PARTS_METAL_THROWABLE_BOMB = new ResourceLocation(ImmersiveWeapons.MOD_ID, "small_parts_metal_throwable_bomb"); + ResourceLocation SMALL_PARTS_METAL_TOOL = new ResourceLocation(ImmersiveWeapons.MOD_ID, "small_parts_metal_tool"); + ResourceLocation SMOKE_BOMB = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb"); + ResourceLocation SMOKE_BOMB_RED = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_red"); + ResourceLocation SMOKE_BOMB_GREEN = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_green"); + ResourceLocation SMOKE_BOMB_BLUE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_blue"); + ResourceLocation SMOKE_BOMB_PURPLE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_purple"); + ResourceLocation SMOKE_BOMB_YELLOW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_yellow"); + ResourceLocation SMOKE_BOMB_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow"); + ResourceLocation SMOKE_BOMB_ARROW_RED = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow_red"); + ResourceLocation SMOKE_BOMB_ARROW_GREEN = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow_green"); + ResourceLocation SMOKE_BOMB_ARROW_BLUE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow_blue"); + ResourceLocation SMOKE_BOMB_ARROW_PURPLE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow_purple"); + ResourceLocation SMOKE_BOMB_ARROW_YELLOW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow_yellow"); + ResourceLocation GOLD_PIKE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_pike"); + ResourceLocation GOLD_GAUNTLET = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_gauntlet"); + ResourceLocation GOLD_PIKE_HEAD = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_pike_head"); + ResourceLocation GOLD_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_arrow"); + ResourceLocation GOLD_MUSKET_BALL = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_musket_ball"); + ResourceLocation WOOD_PIKE = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_pike"); + ResourceLocation WOOD_GAUNTLET = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_gauntlet"); + ResourceLocation WOOD_SHARD = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_shard"); + ResourceLocation WOOD_TOOL_ROD = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_tool_rod"); + ResourceLocation WOOD_PIKE_HEAD = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_pike_head"); + ResourceLocation WOOD_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_arrow"); + ResourceLocation WOOD_MUSKET_BALL = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_musket_ball"); + + for (Mapping itemMapping : mappings) { + if (itemMapping.key.equals(SMALL_PARTS_METAL_THROWABLE_BOMB)) { + itemMapping.remap(DeferredRegistryHandler.GRENADE_ASSEMBLY.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMALL_PARTS_METAL_TOOL)) { + itemMapping.remap(DeferredRegistryHandler.TOOL_JOINT.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_RED)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_RED.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_GREEN)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_BLUE)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_BLUE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_PURPLE)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_PURPLE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_YELLOW)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_YELLOW.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW_RED)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW_GREEN)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW_BLUE)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW_PURPLE)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(SMOKE_BOMB_ARROW_YELLOW)) { + itemMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(GOLD_PIKE)) { + itemMapping.remap(DeferredRegistryHandler.GOLDEN_PIKE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(GOLD_GAUNTLET)) { + itemMapping.remap(DeferredRegistryHandler.GOLDEN_GAUNTLET.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(GOLD_PIKE_HEAD)) { + itemMapping.remap(DeferredRegistryHandler.GOLDEN_PIKE_HEAD.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(GOLD_ARROW)) { + itemMapping.remap(DeferredRegistryHandler.GOLDEN_ARROW.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(GOLD_MUSKET_BALL)) { + itemMapping.remap(DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_PIKE)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_PIKE.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_GAUNTLET)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_GAUNTLET.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_SHARD)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_SHARD.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_TOOL_ROD)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_TOOL_ROD.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_PIKE_HEAD)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_PIKE_HEAD.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_ARROW)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_ARROW.get()); + remappedItems.add(itemMapping.key.getPath()); + } + if (itemMapping.key.equals(WOOD_MUSKET_BALL)) { + itemMapping.remap(DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()); + remappedItems.add(itemMapping.key.getPath()); + } + } + + ImmersiveWeapons.LOGGER.warn("Item remapping complete. Remapped entries: {}", remappedItems); + ImmersiveWeapons.LOGGER.warn("{}/{} items remapped.", remappedItems.size(), mappings.size()); + } + } + + /** + * Event handler for the MissingMappings (Entity) event. + * Migrates old registry names to newer ones. + * + * @param event the MissingMappings instance + */ + @SubscribeEvent + public static void missingEntityMappings(MissingMappings> event) { + ImmutableList>> mappings = event.getMappings(ImmersiveWeapons.MOD_ID); + + if (!mappings.isEmpty()) { + + ImmersiveWeapons.LOGGER.warn("Missing entity mappings were found. This probably means an entity was renamed or deleted. Attempting to remap..."); + + List remappedEntities = new ArrayList<>(0); + + ResourceLocation SMOKE_BOMB = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb"); + ResourceLocation SMOKE_BOMB_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow"); + ResourceLocation GOLD_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_arrow"); + ResourceLocation GOLD_MUSKET_BALL = new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_musket_ball"); + ResourceLocation WOOD_ARROW = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_arrow"); + ResourceLocation WOOD_MUSKET_BALL = new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_musket_ball"); + + for (Mapping> entityTypeMapping : mappings) { + if (entityTypeMapping.key.equals(SMOKE_BOMB)) { + entityTypeMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + if (entityTypeMapping.key.equals(SMOKE_BOMB_ARROW)) { + entityTypeMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + if (entityTypeMapping.key.equals(GOLD_ARROW)) { + entityTypeMapping.remap(DeferredRegistryHandler.GOLDEN_ARROW_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + if (entityTypeMapping.key.equals(GOLD_MUSKET_BALL)) { + entityTypeMapping.remap(DeferredRegistryHandler.GOLDEN_MUSKET_BALL_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + if (entityTypeMapping.key.equals(WOOD_ARROW)) { + entityTypeMapping.remap(DeferredRegistryHandler.WOODEN_ARROW_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + if (entityTypeMapping.key.equals(WOOD_MUSKET_BALL)) { + entityTypeMapping.remap(DeferredRegistryHandler.WOODEN_MUSKET_BALL_ENTITY.get()); + remappedEntities.add(entityTypeMapping.key.getPath()); + } + } + + ImmersiveWeapons.LOGGER.warn("Entity remapping complete. Remapped entries: {}", remappedEntities); + ImmersiveWeapons.LOGGER.warn("{}/{} entities remapped.", remappedEntities.size(), mappings.size()); + } + } + + /** + * Event handler for the MissingMappings (Sound) event. + * Migrates old registry names to newer ones. + * + * @param event the MissingMappings instance + */ + @SubscribeEvent + public static void missingSoundEventMappings(MissingMappings event) { + ImmutableList> mappings = event.getMappings(ImmersiveWeapons.MOD_ID); + + if (!mappings.isEmpty()) { + + ImmersiveWeapons.LOGGER.warn("Missing sound event mappings were found. This probably means a sound was renamed or deleted. Attempting to remap..."); + + List remappedSoundEvents = new ArrayList<>(0); + + ResourceLocation SMOKE_BOMB_HISS = new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_hiss"); + + for (Mapping soundEventMapping : mappings) { + if (soundEventMapping.key.equals(SMOKE_BOMB_HISS)) { + soundEventMapping.remap(DeferredRegistryHandler.SMOKE_GRENADE_HISS.get()); + remappedSoundEvents.add(soundEventMapping.key.getPath()); + } + } + + ImmersiveWeapons.LOGGER.warn("Sound event remapping complete. Remapped entries: {}", remappedSoundEvents); + ImmersiveWeapons.LOGGER.warn("{}/{} sounds remapped.", remappedSoundEvents.size(), mappings.size()); + } + } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ModEventSubscriber.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ModEventSubscriber.java index 9971782db..8343b922d 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ModEventSubscriber.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/event/ModEventSubscriber.java @@ -26,23 +26,23 @@ public static void onRegisterItems(RegistryEvent.Register event) { DeferredRegistryHandler.IRON_ARROW.get().setItemReference(DeferredRegistryHandler.IRON_ARROW); DeferredRegistryHandler.COBALT_ARROW.get().setItemReference(DeferredRegistryHandler.COBALT_ARROW); DeferredRegistryHandler.DIAMOND_ARROW.get().setItemReference(DeferredRegistryHandler.DIAMOND_ARROW); - DeferredRegistryHandler.GOLD_ARROW.get().setItemReference(DeferredRegistryHandler.GOLD_ARROW); + DeferredRegistryHandler.GOLDEN_ARROW.get().setItemReference(DeferredRegistryHandler.GOLDEN_ARROW); DeferredRegistryHandler.STONE_ARROW.get().setItemReference(DeferredRegistryHandler.STONE_ARROW); - DeferredRegistryHandler.WOOD_ARROW.get().setItemReference(DeferredRegistryHandler.WOOD_ARROW); + DeferredRegistryHandler.WOODEN_ARROW.get().setItemReference(DeferredRegistryHandler.WOODEN_ARROW); DeferredRegistryHandler.NETHERITE_ARROW.get().setItemReference(DeferredRegistryHandler.NETHERITE_ARROW); - DeferredRegistryHandler.SMOKE_BOMB_ARROW.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW); - DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED); - DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN); - DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE); - DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE); - DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW.get().setItemReference(DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE); + DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get().setItemReference(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW); DeferredRegistryHandler.COPPER_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.COPPER_MUSKET_BALL); - DeferredRegistryHandler.WOOD_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.WOOD_MUSKET_BALL); + DeferredRegistryHandler.WOODEN_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.WOODEN_MUSKET_BALL); DeferredRegistryHandler.STONE_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.STONE_MUSKET_BALL); DeferredRegistryHandler.IRON_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.IRON_MUSKET_BALL); DeferredRegistryHandler.COBALT_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.COBALT_MUSKET_BALL); - DeferredRegistryHandler.GOLD_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.GOLD_MUSKET_BALL); + DeferredRegistryHandler.GOLDEN_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.GOLDEN_MUSKET_BALL); DeferredRegistryHandler.DIAMOND_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.DIAMOND_MUSKET_BALL); DeferredRegistryHandler.NETHERITE_MUSKET_BALL.get().setItemReference(DeferredRegistryHandler.NETHERITE_MUSKET_BALL); DeferredRegistryHandler.FLARE.get().setItemReference(DeferredRegistryHandler.FLARE); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DeferredRegistryHandler.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DeferredRegistryHandler.java index 8d2fe776d..6fa05e2b3 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DeferredRegistryHandler.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DeferredRegistryHandler.java @@ -20,7 +20,7 @@ import com.anonymoushacker1279.immersiveweapons.block.trap.*; import com.anonymoushacker1279.immersiveweapons.blockentity.*; import com.anonymoushacker1279.immersiveweapons.client.particle.bullet_impact.BulletImpactParticleOptions; -import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_bomb.SmokeBombParticleOptions; +import com.anonymoushacker1279.immersiveweapons.client.particle.smoke_grenade.SmokeGrenadeParticleOptions; import com.anonymoushacker1279.immersiveweapons.container.SmallPartsContainer; import com.anonymoushacker1279.immersiveweapons.container.TeslaSynthesizerContainer; import com.anonymoushacker1279.immersiveweapons.entity.misc.ChairEntity; @@ -170,9 +170,9 @@ public static void init() { public static final RegistryObject VENTUS_SHOVEL = ITEMS.register("ventus_shovel", () -> new VentusShovel(CustomItemMaterials.VENTUS, 0, -2.9f, new Properties().tab(ITEM_GROUP))); public static final RegistryObject VENTUS_HOE = ITEMS.register("ventus_hoe", () -> new VentusHoe(CustomItemMaterials.VENTUS, -3, 1.0f, new Properties().tab(ITEM_GROUP))); public static final RegistryObject VENTUS_STAFF = ITEMS.register("ventus_staff", () -> new VentusStaff(new Properties().durability(300).tab(ITEM_GROUP))); - public static final RegistryObject WOOD_PIKE = ITEMS.register("wood_pike", () -> new WoodPikeItem(new Properties().durability(59).tab(ITEM_GROUP), 4.0d, -2.6d)); + public static final RegistryObject WOODEN_PIKE = ITEMS.register("wooden_pike", () -> new WoodenPikeItem(new Properties().durability(59).tab(ITEM_GROUP), 4.0d, -2.6d)); public static final RegistryObject STONE_PIKE = ITEMS.register("stone_pike", () -> new StonePikeItem(new Properties().durability(131).tab(ITEM_GROUP), 5.0d, -2.6d)); - public static final RegistryObject GOLD_PIKE = ITEMS.register("gold_pike", () -> new GoldPikeItem(new Properties().durability(32).tab(ITEM_GROUP), 4.0d, -2.6d)); + public static final RegistryObject GOLDEN_PIKE = ITEMS.register("golden_pike", () -> new GoldenPikeItem(new Properties().durability(32).tab(ITEM_GROUP), 4.0d, -2.6d)); public static final RegistryObject COPPER_PIKE = ITEMS.register("copper_pike", () -> new CopperPikeItem(new Properties().durability(180).tab(ITEM_GROUP), 5.0d, -2.6d)); public static final RegistryObject IRON_PIKE = ITEMS.register("iron_pike", () -> new IronPikeItem(new Properties().durability(250).tab(ITEM_GROUP), 6.0d, -2.6d)); public static final RegistryObject COBALT_PIKE = ITEMS.register("cobalt_pike", () -> new CobaltPikeItem(new Properties().durability(300).tab(ITEM_GROUP), 6.0d, -2.6d)); @@ -184,9 +184,9 @@ public static void init() { public static final RegistryObject MUSKET_SCOPE = ITEMS.register("musket_scope", () -> new MusketItem(new Properties().tab(ITEM_GROUP).durability(499), true)); public static final RegistryObject FLARE_GUN = ITEMS.register("flare_gun", () -> new FlareGunItem(new Properties().tab(ITEM_GROUP).durability(399))); - public static final RegistryObject WOOD_GAUNTLET = ITEMS.register("wood_gauntlet", () -> new WoodGauntletItem(Tiers.WOOD, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.15f)); + public static final RegistryObject WOODEN_GAUNTLET = ITEMS.register("wooden_gauntlet", () -> new WoodenGauntletItem(Tiers.WOOD, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.15f)); public static final RegistryObject STONE_GAUNTLET = ITEMS.register("stone_gauntlet", () -> new StoneGauntletItem(Tiers.STONE, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.25f)); - public static final RegistryObject GOLD_GAUNTLET = ITEMS.register("gold_gauntlet", () -> new GoldGauntletItem(Tiers.GOLD, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.35f)); + public static final RegistryObject GOLDEN_GAUNTLET = ITEMS.register("golden_gauntlet", () -> new GoldenGauntletItem(Tiers.GOLD, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.35f)); public static final RegistryObject COPPER_GAUNTLET = ITEMS.register("copper_gauntlet", () -> new CopperGauntletItem(CustomItemMaterials.COPPER, 1, -2.3f, new Properties().tab(ITEM_GROUP), 0.45f)); public static final RegistryObject IRON_GAUNTLET = ITEMS.register("iron_gauntlet", () -> new IronGauntletItem(Tiers.IRON, 2, -2.3f, new Properties().tab(ITEM_GROUP), 0.55f)); public static final RegistryObject COBALT_GAUNTLET = ITEMS.register("cobalt_gauntlet", () -> new CobaltGauntletItem(CustomItemMaterials.COBALT, 1, -2.3f, new Properties().tab(ITEM_GROUP), 0.60f)); @@ -199,10 +199,10 @@ public static void init() { public static final RegistryObject OBSIDIAN_SHARD = ITEMS.register("obsidian_shard", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject MOLTEN_SHARD = ITEMS.register("molten_shard", () -> new Item(new Properties().tab(ITEM_GROUP).fireResistant())); public static final RegistryObject VENTUS_SHARD = ITEMS.register("ventus_shard", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject WOOD_SHARD = ITEMS.register("wood_shard", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject WOODEN_SHARD = ITEMS.register("wooden_shard", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject COPPER_NUGGET = ITEMS.register("copper_nugget", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject COBALT_NUGGET = ITEMS.register("cobalt_nugget", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject WOOD_TOOL_ROD = ITEMS.register("wood_tool_rod", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject WOODEN_TOOL_ROD = ITEMS.register("wooden_tool_rod", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject OBSIDIAN_ROD = ITEMS.register("obsidian_rod", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject MOLTEN_INGOT = ITEMS.register("molten_ingot", () -> new FuelItem(new Properties().tab(ITEM_GROUP).fireResistant(), 24000)); public static final RegistryObject CONDUCTIVE_ALLOY = ITEMS.register("conductive_alloy", () -> new Item(new Properties().tab(ITEM_GROUP))); @@ -215,39 +215,39 @@ public static void init() { public static final RegistryObject AZUL_KEYSTONE = ITEMS.register("azul_keystone", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject AZUL_KEYSTONE_FRAGMENT = ITEMS.register("azul_keystone_fragment", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject CELESTIAL_FRAGMENT = ITEMS.register("celestial_fragment", () -> new Item(new Properties().tab(ITEM_GROUP).fireResistant())); - public static final RegistryObject WOOD_PIKE_HEAD = ITEMS.register("wood_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject WOODEN_PIKE_HEAD = ITEMS.register("wooden_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject STONE_PIKE_HEAD = ITEMS.register("stone_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject GOLD_PIKE_HEAD = ITEMS.register("gold_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject GOLDEN_PIKE_HEAD = ITEMS.register("golden_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject COPPER_PIKE_HEAD = ITEMS.register("copper_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject IRON_PIKE_HEAD = ITEMS.register("iron_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject COBALT_PIKE_HEAD = ITEMS.register("cobalt_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject DIAMOND_PIKE_HEAD = ITEMS.register("diamond_pike_head", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject WOOD_ARROW = ITEMS.register("wood_arrow", () -> new WoodArrowItem(new Properties().tab(ITEM_GROUP), 1.65d)); + public static final RegistryObject WOODEN_ARROW = ITEMS.register("wooden_arrow", () -> new WoodenArrowItem(new Properties().tab(ITEM_GROUP), 1.65d)); public static final RegistryObject STONE_ARROW = ITEMS.register("stone_arrow", () -> new StoneArrowItem(new Properties().tab(ITEM_GROUP), 1.85d)); - public static final RegistryObject GOLD_ARROW = ITEMS.register("gold_arrow", () -> new GoldArrowItem(new Properties().tab(ITEM_GROUP), 2.10d)); + public static final RegistryObject GOLDEN_ARROW = ITEMS.register("golden_arrow", () -> new GoldenArrowItem(new Properties().tab(ITEM_GROUP), 2.10d)); public static final RegistryObject COPPER_ARROW = ITEMS.register("copper_arrow", () -> new CopperArrowItem(new Properties().tab(ITEM_GROUP), 2.15d)); public static final RegistryObject IRON_ARROW = ITEMS.register("iron_arrow", () -> new IronArrowItem(new Properties().tab(ITEM_GROUP), 2.35d)); public static final RegistryObject COBALT_ARROW = ITEMS.register("cobalt_arrow", () -> new CobaltArrowItem(new Properties().tab(ITEM_GROUP), 2.55d)); public static final RegistryObject DIAMOND_ARROW = ITEMS.register("diamond_arrow", () -> new DiamondArrowItem(new Properties().tab(ITEM_GROUP), 3.00d)); public static final RegistryObject NETHERITE_ARROW = ITEMS.register("netherite_arrow", () -> new NetheriteArrowItem(new Properties().tab(ITEM_GROUP).fireResistant(), 5.75d)); - public static final RegistryObject SMOKE_BOMB_ARROW = ITEMS.register("smoke_bomb_arrow", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 0)); - public static final RegistryObject SMOKE_BOMB_ARROW_RED = ITEMS.register("smoke_bomb_arrow_red", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 1)); - public static final RegistryObject SMOKE_BOMB_ARROW_GREEN = ITEMS.register("smoke_bomb_arrow_green", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 2)); - public static final RegistryObject SMOKE_BOMB_ARROW_BLUE = ITEMS.register("smoke_bomb_arrow_blue", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 3)); - public static final RegistryObject SMOKE_BOMB_ARROW_PURPLE = ITEMS.register("smoke_bomb_arrow_purple", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 4)); - public static final RegistryObject SMOKE_BOMB_ARROW_YELLOW = ITEMS.register("smoke_bomb_arrow_yellow", () -> new SmokeBombArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 5)); - public static final RegistryObject WOOD_MUSKET_BALL = ITEMS.register("wood_musket_ball", () -> new WoodBulletItem(new Properties().tab(ITEM_GROUP), 2.0d)); - public static final RegistryObject STONE_MUSKET_BALL = ITEMS.register("stone_musket_ball", () -> new StoneBulletItem(new Properties().tab(ITEM_GROUP), 2.20d)); - public static final RegistryObject GOLD_MUSKET_BALL = ITEMS.register("gold_musket_ball", () -> new GoldBulletItem(new Properties().tab(ITEM_GROUP), 2.30d)); - public static final RegistryObject COPPER_MUSKET_BALL = ITEMS.register("copper_musket_ball", () -> new CopperBulletItem(new Properties().tab(ITEM_GROUP), 2.40d)); - public static final RegistryObject IRON_MUSKET_BALL = ITEMS.register("iron_musket_ball", () -> new IronBulletItem(new Properties().tab(ITEM_GROUP), 2.65d)); - public static final RegistryObject COBALT_MUSKET_BALL = ITEMS.register("cobalt_musket_ball", () -> new CobaltBulletItem(new Properties().tab(ITEM_GROUP), 2.90d)); - public static final RegistryObject DIAMOND_MUSKET_BALL = ITEMS.register("diamond_musket_ball", () -> new DiamondBulletItem(new Properties().tab(ITEM_GROUP), 3.35d)); - public static final RegistryObject NETHERITE_MUSKET_BALL = ITEMS.register("netherite_musket_ball", () -> new NetheriteBulletItem(new Properties().tab(ITEM_GROUP).fireResistant(), 6.50d)); + public static final RegistryObject SMOKE_GRENADE_ARROW = ITEMS.register("smoke_grenade_arrow", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 0)); + public static final RegistryObject SMOKE_GRENADE_ARROW_RED = ITEMS.register("smoke_grenade_arrow_red", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 1)); + public static final RegistryObject SMOKE_GRENADE_ARROW_GREEN = ITEMS.register("smoke_grenade_arrow_green", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 2)); + public static final RegistryObject SMOKE_GRENADE_ARROW_BLUE = ITEMS.register("smoke_grenade_arrow_blue", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 3)); + public static final RegistryObject SMOKE_GRENADE_ARROW_PURPLE = ITEMS.register("smoke_grenade_arrow_purple", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 4)); + public static final RegistryObject SMOKE_GRENADE_ARROW_YELLOW = ITEMS.register("smoke_grenade_arrow_yellow", () -> new SmokeGrenadeArrowItem(new Properties().tab(ITEM_GROUP), 2.00d, 5)); + public static final RegistryObject WOODEN_MUSKET_BALL = ITEMS.register("wooden_musket_ball", () -> new WoodenMusketBallItem(new Properties().tab(ITEM_GROUP), 2.0d)); + public static final RegistryObject STONE_MUSKET_BALL = ITEMS.register("stone_musket_ball", () -> new StoneMusketBallItem(new Properties().tab(ITEM_GROUP), 2.20d)); + public static final RegistryObject GOLDEN_MUSKET_BALL = ITEMS.register("golden_musket_ball", () -> new GoldenMusketBallItem(new Properties().tab(ITEM_GROUP), 2.30d)); + public static final RegistryObject COPPER_MUSKET_BALL = ITEMS.register("copper_musket_ball", () -> new CopperMusketBallItem(new Properties().tab(ITEM_GROUP), 2.40d)); + public static final RegistryObject IRON_MUSKET_BALL = ITEMS.register("iron_musket_ball", () -> new IronMusketBallItem(new Properties().tab(ITEM_GROUP), 2.65d)); + public static final RegistryObject COBALT_MUSKET_BALL = ITEMS.register("cobalt_musket_ball", () -> new CobaltMusketBallItem(new Properties().tab(ITEM_GROUP), 2.90d)); + public static final RegistryObject DIAMOND_MUSKET_BALL = ITEMS.register("diamond_musket_ball", () -> new DiamondMusketBallItem(new Properties().tab(ITEM_GROUP), 3.35d)); + public static final RegistryObject NETHERITE_MUSKET_BALL = ITEMS.register("netherite_musket_ball", () -> new NetheriteMusketBallItem(new Properties().tab(ITEM_GROUP).fireResistant(), 6.50d)); public static final RegistryObject FLARE = ITEMS.register("flare", () -> new FlareItem(new Properties().tab(ITEM_GROUP), 0.1d)); public static final RegistryObject MORTAR_SHELL = ITEMS.register("mortar_shell", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject SMALL_PARTS_METAL_THROWABLE_BOMB = ITEMS.register("small_parts_metal_throwable_bomb", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject SMALL_PARTS_METAL_TOOL = ITEMS.register("small_parts_metal_tool", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject GRENADE_ASSEMBLY = ITEMS.register("grenade_assembly", () -> new Item(new Properties().tab(ITEM_GROUP))); + public static final RegistryObject TOOL_JOINT = ITEMS.register("tool_joint", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject GAUNTLET_SCAFFOLDING = ITEMS.register("gauntlet_scaffolding", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject FLINTLOCK_ASSEMBLY = ITEMS.register("flintlock_assembly", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject TRIGGER_ASSEMBLY = ITEMS.register("trigger_assembly", () -> new Item(new Properties().tab(ITEM_GROUP))); @@ -259,12 +259,12 @@ public static void init() { public static final RegistryObject WIDE_GOLDEN_BARREL = ITEMS.register("wide_golden_barrel", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject SCOPE_MOUNT = ITEMS.register("scope_mount", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject SCOPE = ITEMS.register("scope", () -> new Item(new Properties().tab(ITEM_GROUP))); - public static final RegistryObject SMOKE_BOMB = ITEMS.register("smoke_bomb", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 0)); - public static final RegistryObject SMOKE_BOMB_RED = ITEMS.register("smoke_bomb_red", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 1)); - public static final RegistryObject SMOKE_BOMB_GREEN = ITEMS.register("smoke_bomb_green", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 2)); - public static final RegistryObject SMOKE_BOMB_BLUE = ITEMS.register("smoke_bomb_blue", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 3)); - public static final RegistryObject SMOKE_BOMB_PURPLE = ITEMS.register("smoke_bomb_purple", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 4)); - public static final RegistryObject SMOKE_BOMB_YELLOW = ITEMS.register("smoke_bomb_yellow", () -> new SmokeBombItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 5)); + public static final RegistryObject SMOKE_GRENADE = ITEMS.register("smoke_grenade", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 0)); + public static final RegistryObject SMOKE_GRENADE_RED = ITEMS.register("smoke_grenade_red", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 1)); + public static final RegistryObject SMOKE_GRENADE_GREEN = ITEMS.register("smoke_grenade_green", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 2)); + public static final RegistryObject SMOKE_GRENADE_BLUE = ITEMS.register("smoke_grenade_blue", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 3)); + public static final RegistryObject SMOKE_GRENADE_PURPLE = ITEMS.register("smoke_grenade_purple", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 4)); + public static final RegistryObject SMOKE_GRENADE_YELLOW = ITEMS.register("smoke_grenade_yellow", () -> new SmokeGrenadeItem(new Properties().tab(ITEM_GROUP).stacksTo(16), 5)); public static final RegistryObject MOLOTOV_COCKTAIL = ITEMS.register("molotov_cocktail", () -> new MolotovItem(new Properties().tab(ITEM_GROUP).stacksTo(16))); public static final RegistryObject SMOKE_POWDER = ITEMS.register("smoke_powder", () -> new Item(new Properties().tab(ITEM_GROUP))); public static final RegistryObject MORTAR_AND_PESTLE = ITEMS.register("mortar_and_pestle", () -> new BasicContainerItem(new Properties().tab(ITEM_GROUP))); @@ -447,25 +447,25 @@ public static void init() { public static final RegistryObject HANS_WALL_HEAD = BLOCKS.register("hans_wall_head", () -> new CustomWallSkullBlock(CustomSkullTypes.HANS, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0f).lootFrom(() -> HANS_HEAD.get()))); // Entities - public static final RegistryObject> WOOD_ARROW_ENTITY = ENTITY_TYPES.register("wood_arrow", () -> EntityType.Builder. of(WoodArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_arrow").toString())); + public static final RegistryObject> WOODEN_ARROW_ENTITY = ENTITY_TYPES.register("wooden_arrow", () -> EntityType.Builder. of(WoodenArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_arrow").toString())); public static final RegistryObject> STONE_ARROW_ENTITY = ENTITY_TYPES.register("stone_arrow", () -> EntityType.Builder. of(StoneArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "stone_arrow").toString())); - public static final RegistryObject> GOLD_ARROW_ENTITY = ENTITY_TYPES.register("gold_arrow", () -> EntityType.Builder. of(GoldArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_arrow").toString())); + public static final RegistryObject> GOLDEN_ARROW_ENTITY = ENTITY_TYPES.register("golden_arrow", () -> EntityType.Builder. of(GoldenArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_arrow").toString())); public static final RegistryObject> COPPER_ARROW_ENTITY = ENTITY_TYPES.register("copper_arrow", () -> EntityType.Builder. of(CopperArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "copper_arrow").toString())); public static final RegistryObject> IRON_ARROW_ENTITY = ENTITY_TYPES.register("iron_arrow", () -> EntityType.Builder. of(IronArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "iron_arrow").toString())); public static final RegistryObject> COBALT_ARROW_ENTITY = ENTITY_TYPES.register("cobalt_arrow", () -> EntityType.Builder. of(CobaltArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "cobalt_arrow").toString())); public static final RegistryObject> DIAMOND_ARROW_ENTITY = ENTITY_TYPES.register("diamond_arrow", () -> EntityType.Builder. of(DiamondArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "diamond_arrow").toString())); public static final RegistryObject> NETHERITE_ARROW_ENTITY = ENTITY_TYPES.register("netherite_arrow", () -> EntityType.Builder. of(NetheriteArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "netherite_arrow").toString())); - public static final RegistryObject> SMOKE_BOMB_ARROW_ENTITY = ENTITY_TYPES.register("smoke_bomb_arrow", () -> EntityType.Builder. of(SmokeBombArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_arrow").toString())); - public static final RegistryObject> WOOD_BULLET_ENTITY = ENTITY_TYPES.register("wood_musket_ball", () -> EntityType.Builder. of((type, world) -> new WoodBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_musket_ball").toString())); - public static final RegistryObject> STONE_BULLET_ENTITY = ENTITY_TYPES.register("stone_musket_ball", () -> EntityType.Builder. of((type, world) -> new StoneBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "stone_musket_ball").toString())); - public static final RegistryObject> COPPER_BULLET_ENTITY = ENTITY_TYPES.register("copper_musket_ball", () -> EntityType.Builder. of((type, world) -> new CopperBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "copper_musket_ball").toString())); - public static final RegistryObject> IRON_BULLET_ENTITY = ENTITY_TYPES.register("iron_musket_ball", () -> EntityType.Builder. of((type, world) -> new IronBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "iron_musket_ball").toString())); - public static final RegistryObject> COBALT_BULLET_ENTITY = ENTITY_TYPES.register("cobalt_musket_ball", () -> EntityType.Builder. of((type, world) -> new CobaltBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "cobalt_musket_ball").toString())); - public static final RegistryObject> GOLD_BULLET_ENTITY = ENTITY_TYPES.register("gold_musket_ball", () -> EntityType.Builder. of((type, world) -> new GoldBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_musket_ball").toString())); - public static final RegistryObject> DIAMOND_BULLET_ENTITY = ENTITY_TYPES.register("diamond_musket_ball", () -> EntityType.Builder. of((type, world) -> new DiamondBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "diamond_musket_ball").toString())); - public static final RegistryObject> NETHERITE_BULLET_ENTITY = ENTITY_TYPES.register("netherite_musket_ball", () -> EntityType.Builder. of((type, world) -> new NetheriteBulletEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "netherite_musket_ball").toString())); + public static final RegistryObject> SMOKE_GRENADE_ARROW_ENTITY = ENTITY_TYPES.register("smoke_grenade_arrow", () -> EntityType.Builder. of(SmokeGrenadeArrowEntity::new, MobCategory.MISC).sized(0.5f, 0.5f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_grenade_arrow").toString())); + public static final RegistryObject> WOODEN_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("wooden_musket_ball", () -> EntityType.Builder. of((type, world) -> new WoodenMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "wood_musket_ball").toString())); + public static final RegistryObject> STONE_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("stone_musket_ball", () -> EntityType.Builder. of((type, world) -> new StoneMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "stone_musket_ball").toString())); + public static final RegistryObject> GOLDEN_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("golden_musket_ball", () -> EntityType.Builder. of((type, world) -> new GoldenMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "gold_musket_ball").toString())); + public static final RegistryObject> COPPER_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("copper_musket_ball", () -> EntityType.Builder. of((type, world) -> new CopperMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "copper_musket_ball").toString())); + public static final RegistryObject> IRON_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("iron_musket_ball", () -> EntityType.Builder. of((type, world) -> new IronMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "iron_musket_ball").toString())); + public static final RegistryObject> COBALT_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("cobalt_musket_ball", () -> EntityType.Builder. of((type, world) -> new CobaltMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "cobalt_musket_ball").toString())); + public static final RegistryObject> DIAMOND_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("diamond_musket_ball", () -> EntityType.Builder. of((type, world) -> new DiamondMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "diamond_musket_ball").toString())); + public static final RegistryObject> NETHERITE_MUSKET_BALL_ENTITY = ENTITY_TYPES.register("netherite_musket_ball", () -> EntityType.Builder. of((type, world) -> new NetheriteMusketBallEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "netherite_musket_ball").toString())); public static final RegistryObject> FLARE_ENTITY = ENTITY_TYPES.register("flare", () -> EntityType.Builder. of((type, world) -> new FlareEntity(type, world, 0), MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "flare").toString())); - public static final RegistryObject> SMOKE_BOMB_ENTITY = ENTITY_TYPES.register("smoke_bomb", () -> EntityType.Builder. of(SmokeBombEntity::new, MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb").toString())); + public static final RegistryObject> SMOKE_GRENADE_ENTITY = ENTITY_TYPES.register("smoke_grenade", () -> EntityType.Builder. of(SmokeGrenadeEntity::new, MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_grenade").toString())); public static final RegistryObject> MOLOTOV_COCKTAIL_ENTITY = ENTITY_TYPES.register("molotov_cocktail", () -> EntityType.Builder. of(MolotovEntity::new, MobCategory.MISC).sized(0.25f, 0.25f).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "molotov_cocktail").toString())); public static final RegistryObject> DYING_SOLDIER_ENTITY = ENTITY_TYPES.register("dying_soldier", () -> EntityType.Builder.of(DyingSoldierEntity::new, MobCategory.MONSTER).sized(0.6f, 1.99f).clientTrackingRange(8).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "dying_soldier").toString())); public static final RegistryObject> MINUTEMAN_ENTITY = ENTITY_TYPES.register("minuteman", () -> EntityType.Builder.of(MinutemanEntity::new, MobCategory.CREATURE).sized(0.6f, 1.99f).clientTrackingRange(16).build(new ResourceLocation(ImmersiveWeapons.MOD_ID, "minuteman").toString())); @@ -600,7 +600,7 @@ public static void init() { public static final RegistryObject BULLET_WHIZZ = SOUND_EVENTS.register("bullet_whizz", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "bullet_whizz"))); public static final RegistryObject FLINTLOCK_PISTOL_MISFIRE = SOUND_EVENTS.register("flintlock_pistol_misfire", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "flintlock_pistol_misfire"))); public static final RegistryObject SMALL_PARTS_TABLE_USED = SOUND_EVENTS.register("small_parts_table_used", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "small_parts_table_used"))); - public static final RegistryObject SMOKE_BOMB_HISS = SOUND_EVENTS.register("smoke_bomb_hiss", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_bomb_hiss"))); + public static final RegistryObject SMOKE_GRENADE_HISS = SOUND_EVENTS.register("smoke_grenade_hiss", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "smoke_grenade_hiss"))); public static final RegistryObject GENERIC_WHOOSH = SOUND_EVENTS.register("generic_whoosh", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "generic_whoosh"))); public static final RegistryObject BLUNDERBUSS_FIRE = SOUND_EVENTS.register("blunderbuss_fire", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "blunderbuss_fire"))); public static final RegistryObject BARBED_WIRE_RATTLE = SOUND_EVENTS.register("barbed_wire_rattle", () -> new SoundEvent(new ResourceLocation(ImmersiveWeapons.MOD_ID, "barbed_wire_rattle"))); @@ -651,10 +651,10 @@ public static void init() { public static final RegistryObject AZUL_KEYSTONE_FRAGMENT_IN_CHESTS_MODIFIER = GLOBAL_LOOT_MODIFIER_SERIALIZER.register("azul_keystone_fragment_in_chests", AzulKeystoneFragmentInChestsLootModifierHandler.Serializer::new); // Particles - public static final RegistryObject> SMOKE_BOMB_PARTICLE = PARTICLE_TYPES.register("smoke_bomb", () -> new ParticleType<>(false, SmokeBombParticleOptions.DESERIALIZER) { - final Function, Codec> codec = (type) -> SmokeBombParticleOptions.CODEC; + public static final RegistryObject> SMOKE_GRENADE_PARTICLE = PARTICLE_TYPES.register("smoke_grenade", () -> new ParticleType<>(false, SmokeGrenadeParticleOptions.DESERIALIZER) { + final Function, Codec> codec = (type) -> SmokeGrenadeParticleOptions.CODEC; - public @NotNull Codec codec() { + public @NotNull Codec codec() { return codec.apply(this); } }); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DispenserBehaviorRegistry.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DispenserBehaviorRegistry.java index 7d687bd8d..8a77cf185 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DispenserBehaviorRegistry.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/DispenserBehaviorRegistry.java @@ -2,7 +2,7 @@ import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.*; import com.anonymoushacker1279.immersiveweapons.entity.projectile.MolotovEntity; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeBombEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeGrenadeEntity; import net.minecraft.core.BlockSource; import net.minecraft.core.Position; import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior; @@ -56,10 +56,10 @@ public static void init() { return arrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.GOLD_ARROW.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.GOLDEN_ARROW.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - GoldArrowEntity arrowEntity = new GoldArrowEntity(worldIn, position.x(), position.y(), position.z()); + GoldenArrowEntity arrowEntity = new GoldenArrowEntity(worldIn, position.x(), position.y(), position.z()); arrowEntity.pickup = AbstractArrow.Pickup.ALLOWED; arrowEntity.setBaseDamage(2.10d); return arrowEntity; @@ -74,10 +74,10 @@ public static void init() { return arrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.WOOD_ARROW.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.WOODEN_ARROW.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - WoodArrowEntity arrowEntity = new WoodArrowEntity(worldIn, position.x(), position.y(), position.z()); + WoodenArrowEntity arrowEntity = new WoodenArrowEntity(worldIn, position.x(), position.y(), position.z()); arrowEntity.pickup = AbstractArrow.Pickup.ALLOWED; arrowEntity.setBaseDamage(1.65d); return arrowEntity; @@ -93,128 +93,128 @@ public static void init() { } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(0); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(0); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_RED.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_RED.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(1); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(1); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_GREEN.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_GREEN.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(2); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(2); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_BLUE.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_BLUE.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(3); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(3); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_PURPLE.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_PURPLE.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(4); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(4); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_YELLOW.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_YELLOW.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombEntity.push(5, 5, 5); - SmokeBombEntity.setColor(5); - return smokeBombEntity; + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeEntity.push(5, 5, 5); + SmokeGrenadeEntity.setColor(5); + return smokeGrenadeEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + return smokeGrenadeArrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW_RED.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_RED.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - SmokeBombArrowEntity.setColor(1); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + SmokeGrenadeArrowEntity.setColor(1); + return smokeGrenadeArrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW_GREEN.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_GREEN.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - SmokeBombArrowEntity.setColor(2); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + SmokeGrenadeArrowEntity.setColor(2); + return smokeGrenadeArrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW_BLUE.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_BLUE.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - SmokeBombArrowEntity.setColor(3); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + SmokeGrenadeArrowEntity.setColor(3); + return smokeGrenadeArrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW_PURPLE.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_PURPLE.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - SmokeBombArrowEntity.setColor(4); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + SmokeGrenadeArrowEntity.setColor(4); + return smokeGrenadeArrowEntity; } }); - DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_BOMB_ARROW_YELLOW.get(), new AbstractProjectileDispenseBehavior() { + DispenserBlock.registerBehavior(DeferredRegistryHandler.SMOKE_GRENADE_ARROW_YELLOW.get(), new AbstractProjectileDispenseBehavior() { @Override protected @NotNull Projectile getProjectile(@NotNull Level worldIn, @NotNull Position position, @NotNull ItemStack stackIn) { - SmokeBombArrowEntity smokeBombArrowEntity = new SmokeBombArrowEntity(worldIn, position.x(), position.y(), position.z()); - smokeBombArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; - smokeBombArrowEntity.push(5, 5, 5); - SmokeBombArrowEntity.setColor(5); - return smokeBombArrowEntity; + SmokeGrenadeArrowEntity smokeGrenadeArrowEntity = new SmokeGrenadeArrowEntity(worldIn, position.x(), position.y(), position.z()); + smokeGrenadeArrowEntity.pickup = AbstractArrow.Pickup.DISALLOWED; + smokeGrenadeArrowEntity.push(5, 5, 5); + SmokeGrenadeArrowEntity.setColor(5); + return smokeGrenadeArrowEntity; } }); @@ -236,7 +236,6 @@ public static void init() { * @param itemStack the ItemStack being dispensed * @return ItemStack */ - @SuppressWarnings("ConstantConditions") @Override public @NotNull ItemStack dispense(@NotNull BlockSource source, @NotNull ItemStack itemStack) { return null; diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PacketHandler.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PacketHandler.java index 8b2a57fe9..36e479be4 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PacketHandler.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PacketHandler.java @@ -6,8 +6,8 @@ import com.anonymoushacker1279.immersiveweapons.block.trap.SpikeTrapBlock.SpikeTrapBlockPacketHandler; import com.anonymoushacker1279.immersiveweapons.entity.monster.lava_revenant.LavaRevenantEntity.LavaRevenantEntityPacketHandler; import com.anonymoushacker1279.immersiveweapons.entity.neutral.AbstractFieldMedicEntity.AbstractFieldMedicEntityPacketHandler; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.SmokeBombArrowEntityPacketHandler; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeBombEntity.SmokeBombEntityPacketHandler; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.SmokeGrenadeArrowEntityPacketHandler; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeGrenadeEntity.SmokeGrenadeEntityPacketHandler; import com.anonymoushacker1279.immersiveweapons.item.armor.CobaltArmorItem.CobaltArmorItemPacketHandler; import com.anonymoushacker1279.immersiveweapons.item.armor.TeslaArmorItem.TeslaArmorItemPacketHandler; import com.anonymoushacker1279.immersiveweapons.item.armor.VentusArmorItem.VentusArmorItemPacketHandler; @@ -32,16 +32,16 @@ public class PacketHandler { public static void registerPackets() { int networkId = 0; PacketHandler.INSTANCE.registerMessage(networkId++, - SmokeBombEntityPacketHandler.class, - SmokeBombEntityPacketHandler::encode, - SmokeBombEntityPacketHandler::decode, - SmokeBombEntityPacketHandler::handle + SmokeGrenadeEntityPacketHandler.class, + SmokeGrenadeEntityPacketHandler::encode, + SmokeGrenadeEntityPacketHandler::decode, + SmokeGrenadeEntityPacketHandler::handle ); PacketHandler.INSTANCE.registerMessage(networkId++, - SmokeBombArrowEntityPacketHandler.class, - SmokeBombArrowEntityPacketHandler::encode, - SmokeBombArrowEntityPacketHandler::decode, - SmokeBombArrowEntityPacketHandler::handle + SmokeGrenadeArrowEntityPacketHandler.class, + SmokeGrenadeArrowEntityPacketHandler::encode, + SmokeGrenadeArrowEntityPacketHandler::decode, + SmokeGrenadeArrowEntityPacketHandler::handle ); PacketHandler.INSTANCE.registerMessage(networkId++, CobaltArmorItemPacketHandler.class, diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PostSetupHandler.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PostSetupHandler.java index f9344d1a6..73124d7f5 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PostSetupHandler.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/init/PostSetupHandler.java @@ -37,9 +37,9 @@ public static void init() { Builder combineBuilder = ImmutableMultimap.builder(); // Wood Pike Item - combineBuilder.putAll(WoodPikeItem.pikeAttributes); + combineBuilder.putAll(WoodenPikeItem.pikeAttributes); combineBuilder.putAll(newAttributes); - WoodPikeItem.pikeAttributes = combineBuilder.build(); + WoodenPikeItem.pikeAttributes = combineBuilder.build(); // Stone Pike Item combineBuilder = ImmutableMultimap.builder(); @@ -49,9 +49,9 @@ public static void init() { // Gold Pike Item combineBuilder = ImmutableMultimap.builder(); - combineBuilder.putAll(GoldPikeItem.pikeAttributes); + combineBuilder.putAll(GoldenPikeItem.pikeAttributes); combineBuilder.putAll(newAttributes); - GoldPikeItem.pikeAttributes = combineBuilder.build(); + GoldenPikeItem.pikeAttributes = combineBuilder.build(); // Copper Pike Item combineBuilder = ImmutableMultimap.builder(); @@ -94,9 +94,9 @@ public static void init() { combineBuilder = ImmutableMultimap.builder(); // Wood Gauntlet Item - combineBuilder.putAll(WoodGauntletItem.gauntletAttributes); + combineBuilder.putAll(WoodenGauntletItem.gauntletAttributes); combineBuilder.putAll(newAttributes); - WoodGauntletItem.gauntletAttributes = combineBuilder.build(); + WoodenGauntletItem.gauntletAttributes = combineBuilder.build(); // Stone Gauntlet Item combineBuilder = ImmutableMultimap.builder(); @@ -106,9 +106,9 @@ public static void init() { // Gold Gauntlet Item combineBuilder = ImmutableMultimap.builder(); - combineBuilder.putAll(GoldGauntletItem.gauntletAttributes); + combineBuilder.putAll(GoldenGauntletItem.gauntletAttributes); combineBuilder.putAll(newAttributes); - GoldGauntletItem.gauntletAttributes = combineBuilder.build(); + GoldenGauntletItem.gauntletAttributes = combineBuilder.build(); // Copper Gauntlet Item combineBuilder = ImmutableMultimap.builder(); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldGauntletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldenGauntletItem.java similarity index 67% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldGauntletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldenGauntletItem.java index 7eb5e732d..fef0e5e1a 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldGauntletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/GoldenGauntletItem.java @@ -5,19 +5,15 @@ import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.Tier; +import net.minecraft.world.entity.ai.attributes.*; +import net.minecraft.world.item.*; import net.minecraft.world.item.crafting.Ingredient; import org.jetbrains.annotations.NotNull; -public class GoldGauntletItem extends GauntletItem { +public class GoldenGauntletItem extends GauntletItem { public static Multimap gauntletAttributes; - public GoldGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedModifier, Properties properties, float bleedChance) { + public GoldenGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedModifier, Properties properties, float bleedChance) { super(tier, attackDamageModifier, attackSpeedModifier, properties, bleedChance); Builder builder = ImmutableMultimap.builder(); builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", (float) attackDamageModifier + tier.getAttackDamageBonus(), AttributeModifier.Operation.ADDITION)); @@ -29,9 +25,9 @@ public GoldGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedMo public @NotNull Multimap getAttributeModifiers(EquipmentSlot equipmentSlot, ItemStack stack) { Multimap returnValue; if (PostSetupHandler.hasCompletedClientSetup) { - returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? GoldGauntletItem.gauntletAttributes : super.getAttributeModifiers(equipmentSlot, stack); + returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? GoldenGauntletItem.gauntletAttributes : super.getAttributeModifiers(equipmentSlot, stack); } else { - returnValue = GoldGauntletItem.gauntletAttributes; + returnValue = GoldenGauntletItem.gauntletAttributes; } return returnValue; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodGauntletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodenGauntletItem.java similarity index 70% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodGauntletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodenGauntletItem.java index cef6d641a..dc811bbd6 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodGauntletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/gauntlet/WoodenGauntletItem.java @@ -5,17 +5,15 @@ import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.attributes.*; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; import org.jetbrains.annotations.NotNull; -public class WoodGauntletItem extends GauntletItem { +public class WoodenGauntletItem extends GauntletItem { public static Multimap gauntletAttributes; - public WoodGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedModifier, Properties properties, float bleedChance) { + public WoodenGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedModifier, Properties properties, float bleedChance) { super(tier, attackDamageModifier, attackSpeedModifier, properties, bleedChance); Builder builder = ImmutableMultimap.builder(); builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", (float) attackDamageModifier + tier.getAttackDamageBonus(), AttributeModifier.Operation.ADDITION)); @@ -27,9 +25,9 @@ public WoodGauntletItem(Tier tier, int attackDamageModifier, float attackSpeedMo public @NotNull Multimap getAttributeModifiers(EquipmentSlot equipmentSlot, ItemStack stack) { Multimap returnValue; if (PostSetupHandler.hasCompletedClientSetup) { - returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? WoodGauntletItem.gauntletAttributes : super.getAttributeModifiers(equipmentSlot, stack); + returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? WoodenGauntletItem.gauntletAttributes : super.getAttributeModifiers(equipmentSlot, stack); } else { - returnValue = WoodGauntletItem.gauntletAttributes; + returnValue = WoodenGauntletItem.gauntletAttributes; } return returnValue; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldPikeItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldenPikeItem.java similarity index 75% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldPikeItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldenPikeItem.java index 8084b233e..06d3da510 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldPikeItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/GoldenPikeItem.java @@ -5,14 +5,12 @@ import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.attributes.*; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -public class GoldPikeItem extends PikeItem { +public class GoldenPikeItem extends PikeItem { public static Multimap pikeAttributes; @@ -23,7 +21,7 @@ public class GoldPikeItem extends PikeItem { * @param damageIn the damage * @param attackSpeedIn the attack speed */ - public GoldPikeItem(Properties properties, double damageIn, double attackSpeedIn) { + public GoldenPikeItem(Properties properties, double damageIn, double attackSpeedIn) { super(properties); Builder builder = ImmutableMultimap.builder(); builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Tool modifier", damageIn, AttributeModifier.Operation.ADDITION)); @@ -35,9 +33,9 @@ public GoldPikeItem(Properties properties, double damageIn, double attackSpeedIn public Multimap getAttributeModifiers(EquipmentSlot equipmentSlot, ItemStack stack) { Multimap returnValue; if (PostSetupHandler.hasCompletedClientSetup) { - returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? GoldPikeItem.pikeAttributes : super.getAttributeModifiers(equipmentSlot, stack); + returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? GoldenPikeItem.pikeAttributes : super.getAttributeModifiers(equipmentSlot, stack); } else { - returnValue = GoldPikeItem.pikeAttributes; + returnValue = GoldenPikeItem.pikeAttributes; } return returnValue; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodPikeItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodenPikeItem.java similarity index 73% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodPikeItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodenPikeItem.java index 8f4a89902..f7e7d040b 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodPikeItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/pike/WoodenPikeItem.java @@ -5,12 +5,10 @@ import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.attributes.*; import net.minecraft.world.item.ItemStack; -public class WoodPikeItem extends PikeItem { +public class WoodenPikeItem extends PikeItem { public static Multimap pikeAttributes; @@ -21,7 +19,7 @@ public class WoodPikeItem extends PikeItem { * @param damageIn the damage * @param attackSpeedIn the attack speed */ - public WoodPikeItem(Properties properties, double damageIn, double attackSpeedIn) { + public WoodenPikeItem(Properties properties, double damageIn, double attackSpeedIn) { super(properties); Builder builder = ImmutableMultimap.builder(); builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Tool modifier", damageIn, AttributeModifier.Operation.ADDITION)); @@ -33,9 +31,9 @@ public WoodPikeItem(Properties properties, double damageIn, double attackSpeedIn public Multimap getAttributeModifiers(EquipmentSlot equipmentSlot, ItemStack stack) { Multimap returnValue; if (PostSetupHandler.hasCompletedClientSetup) { - returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? WoodPikeItem.pikeAttributes : super.getAttributeModifiers(equipmentSlot, stack); + returnValue = equipmentSlot == EquipmentSlot.MAINHAND ? WoodenPikeItem.pikeAttributes : super.getAttributeModifiers(equipmentSlot, stack); } else { - returnValue = WoodPikeItem.pikeAttributes; + returnValue = WoodenPikeItem.pikeAttributes; } return returnValue; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldArrowItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldenArrowItem.java similarity index 63% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldArrowItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldenArrowItem.java index 4063a3358..0f171e85e 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldArrowItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/GoldenArrowItem.java @@ -1,12 +1,13 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.arrow; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.GoldArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.GoldenArrowEntity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class GoldArrowItem extends AbstractArrowItem { +public class GoldenArrowItem extends AbstractArrowItem { /** * Constructor for GoldArrowItem. @@ -14,7 +15,7 @@ public class GoldArrowItem extends AbstractArrowItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public GoldArrowItem(Properties properties, double damageIn) { + public GoldenArrowItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -28,8 +29,8 @@ public GoldArrowItem(Properties properties, double damageIn) { * @return GoldArrowEntity */ @Override - public @NotNull GoldArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - GoldArrowEntity arrowEntity = new GoldArrowEntity(shooter, worldIn, ref.get().asItem()); + public @NotNull CustomArrowEntity.GoldenArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + GoldenArrowEntity arrowEntity = new GoldenArrowEntity(shooter, worldIn, ref.get().asItem()); arrowEntity.setBaseDamage(damage); return arrowEntity; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeBombArrowItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeGrenadeArrowItem.java similarity index 59% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeBombArrowItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeGrenadeArrowItem.java index 51887cd08..50da4adc3 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeBombArrowItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/SmokeGrenadeArrowItem.java @@ -1,23 +1,24 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.arrow; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.SmokeBombArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.SmokeGrenadeArrowEntity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class SmokeBombArrowItem extends AbstractArrowItem { +public class SmokeGrenadeArrowItem extends AbstractArrowItem { private final int color; /** - * Constructor for SmokeBombArrowItem. + * Constructor for SmokeGrenadeArrowItem. * * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public SmokeBombArrowItem(Properties properties, double damageIn, int color) { + public SmokeGrenadeArrowItem(Properties properties, double damageIn, int color) { super(properties, damageIn); damage = damageIn; this.color = color; @@ -29,14 +30,14 @@ public SmokeBombArrowItem(Properties properties, double damageIn, int color) { * @param worldIn the World the shooter is in * @param stack the ItemStack being shot * @param shooter the LivingEntity shooting the arrow - * @return SmokeBombArrowEntity + * @return SmokeGrenadeArrowEntity */ @Override - public @NotNull SmokeBombArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - SmokeBombArrowEntity arrowEntity = new SmokeBombArrowEntity(shooter, worldIn, ref.get().asItem()); + public @NotNull CustomArrowEntity.SmokeGrenadeArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + SmokeGrenadeArrowEntity arrowEntity = new SmokeGrenadeArrowEntity(shooter, worldIn, ref.get().asItem()); arrowEntity.setBaseDamage(damage); arrowEntity.pickup = Pickup.DISALLOWED; - SmokeBombArrowEntity.setColor(color); + SmokeGrenadeArrowEntity.setColor(color); return arrowEntity; } } \ No newline at end of file diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodArrowItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodenArrowItem.java similarity index 63% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodArrowItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodenArrowItem.java index 20822bf95..2daed95c8 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodArrowItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/arrow/WoodenArrowItem.java @@ -1,12 +1,13 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.arrow; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.WoodArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.CustomArrowEntity.WoodenArrowEntity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class WoodArrowItem extends AbstractArrowItem { +public class WoodenArrowItem extends AbstractArrowItem { /** * Constructor for WoodArrowItem. @@ -14,7 +15,7 @@ public class WoodArrowItem extends AbstractArrowItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public WoodArrowItem(Properties properties, double damageIn) { + public WoodenArrowItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -28,8 +29,8 @@ public WoodArrowItem(Properties properties, double damageIn) { * @return WoodArrowEntity */ @Override - public @NotNull WoodArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - WoodArrowEntity arrowEntity = new WoodArrowEntity(shooter, worldIn, ref.get().asItem()); + public @NotNull CustomArrowEntity.WoodenArrowEntity createArrow(@NotNull Level worldIn, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + WoodenArrowEntity arrowEntity = new WoodenArrowEntity(shooter, worldIn, ref.get().asItem()); arrowEntity.setBaseDamage(damage); return arrowEntity; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/AbstractBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/AbstractBulletItem.java index a6aacf602..fab57bd31 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/AbstractBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/AbstractBulletItem.java @@ -37,7 +37,7 @@ public void setItemReference(RegistryObject reference) { } public @NotNull BulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - BulletEntity bulletEntity = new BulletEntity(DeferredRegistryHandler.IRON_BULLET_ENTITY.get(), shooter, level); + BulletEntity bulletEntity = new BulletEntity(DeferredRegistryHandler.IRON_MUSKET_BALL_ENTITY.get(), shooter, level); bulletEntity.setBaseDamage(damage); bulletEntity.setOwner(shooter); return bulletEntity; diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltMusketBallItem.java similarity index 73% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltMusketBallItem.java index 1c83824f7..969622955 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CobaltMusketBallItem.java @@ -1,7 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.CobaltBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.CobaltMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -9,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class CobaltBulletItem extends AbstractBulletItem { +public class CobaltMusketBallItem extends AbstractBulletItem { /** * Constructor for CobaltBulletItem. @@ -17,7 +17,7 @@ public class CobaltBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public CobaltBulletItem(Properties properties, double damageIn) { + public CobaltMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -31,8 +31,8 @@ public CobaltBulletItem(Properties properties, double damageIn) { * @return CobaltBulletEntity */ @Override - public @NotNull BulletEntities.CobaltBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - CobaltBulletEntity bulletEntity = new CobaltBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.CobaltMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + CobaltMusketBallEntity bulletEntity = new CobaltMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperMusketBallItem.java index 64504c060..f2333408a 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/CopperMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.CopperBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.CopperMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class CopperBulletItem extends AbstractBulletItem { +public class CopperMusketBallItem extends AbstractBulletItem { /** * Constructor for CopperBulletItem. @@ -16,7 +17,7 @@ public class CopperBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public CopperBulletItem(Properties properties, double damageIn) { + public CopperMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public CopperBulletItem(Properties properties, double damageIn) { * @return CopperBulletItem */ @Override - public @NotNull CopperBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - CopperBulletEntity bulletEntity = new CopperBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.CopperMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + CopperMusketBallEntity bulletEntity = new CopperMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondMusketBallItem.java similarity index 69% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondMusketBallItem.java index 8cf5e83dc..f8805a6a4 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/DiamondMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.DiamondBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.DiamondMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class DiamondBulletItem extends AbstractBulletItem { +public class DiamondMusketBallItem extends AbstractBulletItem { /** * Constructor for DiamondBulletItem. @@ -16,7 +17,7 @@ public class DiamondBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public DiamondBulletItem(Properties properties, double damageIn) { + public DiamondMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public DiamondBulletItem(Properties properties, double damageIn) { * @return DiamondBulletEntity */ @Override - public @NotNull DiamondBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - DiamondBulletEntity bulletEntity = new DiamondBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.DiamondMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + DiamondMusketBallEntity bulletEntity = new DiamondMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldenMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldenMusketBallItem.java index 0647687df..fa4a8357b 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/GoldenMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.GoldBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.GoldenMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class GoldBulletItem extends AbstractBulletItem { +public class GoldenMusketBallItem extends AbstractBulletItem { /** * Constructor for GoldBulletItem. @@ -16,7 +17,7 @@ public class GoldBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public GoldBulletItem(Properties properties, double damageIn) { + public GoldenMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public GoldBulletItem(Properties properties, double damageIn) { * @return GoldBulletEntity */ @Override - public @NotNull GoldBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - GoldBulletEntity bulletEntity = new GoldBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.GoldenMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + GoldenMusketBallEntity bulletEntity = new GoldenMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronMusketBallItem.java index e7a9cbe02..9c8debaf8 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/IronMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.IronBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.IronMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class IronBulletItem extends AbstractBulletItem { +public class IronMusketBallItem extends AbstractBulletItem { /** * Constructor for IronBulletItem. @@ -16,7 +17,7 @@ public class IronBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public IronBulletItem(Properties properties, double damageIn) { + public IronMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public IronBulletItem(Properties properties, double damageIn) { * @return IronBulletEntity */ @Override - public @NotNull IronBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - IronBulletEntity bulletEntity = new IronBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.IronMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + IronMusketBallEntity bulletEntity = new IronMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteMusketBallItem.java index 9b9b5a684..4a8d2adfa 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/NetheriteMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.NetheriteBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.NetheriteMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class NetheriteBulletItem extends AbstractBulletItem { +public class NetheriteMusketBallItem extends AbstractBulletItem { /** * Constructor for NetheriteBulletItem. @@ -16,7 +17,7 @@ public class NetheriteBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public NetheriteBulletItem(Properties properties, double damageIn) { + public NetheriteMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public NetheriteBulletItem(Properties properties, double damageIn) { * @return NetheriteBulletEntity */ @Override - public @NotNull NetheriteBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - NetheriteBulletEntity bulletEntity = new NetheriteBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.NetheriteMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + NetheriteMusketBallEntity bulletEntity = new NetheriteMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneMusketBallItem.java index 3b37f74b6..67b8c2291 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/StoneMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.StoneBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.StoneMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class StoneBulletItem extends AbstractBulletItem { +public class StoneMusketBallItem extends AbstractBulletItem { /** * Constructor for StoneBulletItem. @@ -16,7 +17,7 @@ public class StoneBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public StoneBulletItem(Properties properties, double damageIn) { + public StoneMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public StoneBulletItem(Properties properties, double damageIn) { * @return StoneBulletItem */ @Override - public @NotNull StoneBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - StoneBulletEntity bulletEntity = new StoneBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.StoneMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + StoneMusketBallEntity bulletEntity = new StoneMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodBulletItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodenMusketBallItem.java similarity index 68% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodBulletItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodenMusketBallItem.java index 5cd994b1b..562f4f260 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodBulletItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/bullet/WoodenMusketBallItem.java @@ -1,6 +1,7 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.bullet; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.WoodBulletEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.BulletEntities.WoodenMusketBallEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow.Pickup; @@ -8,7 +9,7 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class WoodBulletItem extends AbstractBulletItem { +public class WoodenMusketBallItem extends AbstractBulletItem { /** * Constructor for WoodBulletItem. @@ -16,7 +17,7 @@ public class WoodBulletItem extends AbstractBulletItem { * @param properties the Properties for the item * @param damageIn the damage to deal on impact */ - public WoodBulletItem(Properties properties, double damageIn) { + public WoodenMusketBallItem(Properties properties, double damageIn) { super(properties, damageIn); damage = damageIn; } @@ -30,8 +31,8 @@ public WoodBulletItem(Properties properties, double damageIn) { * @return WoodBulletEntity */ @Override - public @NotNull WoodBulletEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { - WoodBulletEntity bulletEntity = new WoodBulletEntity(shooter, level, referenceItem.get().asItem()); + public @NotNull BulletEntities.WoodenMusketBallEntity createBullet(@NotNull Level level, @NotNull ItemStack stack, @NotNull LivingEntity shooter) { + WoodenMusketBallEntity bulletEntity = new WoodenMusketBallEntity(shooter, level, referenceItem.get().asItem()); bulletEntity.setBaseDamage(damage); bulletEntity.pickup = Pickup.DISALLOWED; bulletEntity.setSoundEvent(DeferredRegistryHandler.BULLET_WHIZZ.get()); diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/gun/AbstractGunItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/gun/AbstractGunItem.java index e34882eb8..0bc81d4b4 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/gun/AbstractGunItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/gun/AbstractGunItem.java @@ -69,7 +69,7 @@ public void releaseUsing(@NotNull ItemStack itemStack, @NotNull Level level, @No int bulletsToFire = isCreative ? getMaxBulletsToFire() : getBulletsToFire(ammo); // Roll for misfire - if (ammo.getItem() == DeferredRegistryHandler.WOOD_MUSKET_BALL.get()) { + if (ammo.getItem() == DeferredRegistryHandler.WOODEN_MUSKET_BALL.get()) { if (GeneralUtilities.getRandomNumber(1, 10) <= 3) { misfire = true; } diff --git a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeBombItem.java b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeGrenadeItem.java similarity index 78% rename from src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeBombItem.java rename to src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeGrenadeItem.java index 55f64baf9..0d3de361d 100644 --- a/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeBombItem.java +++ b/src/main/java/com/anonymoushacker1279/immersiveweapons/item/projectile/throwable/SmokeGrenadeItem.java @@ -1,6 +1,6 @@ package com.anonymoushacker1279.immersiveweapons.item.projectile.throwable; -import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeBombEntity; +import com.anonymoushacker1279.immersiveweapons.entity.projectile.SmokeGrenadeEntity; import com.anonymoushacker1279.immersiveweapons.init.DeferredRegistryHandler; import com.anonymoushacker1279.immersiveweapons.util.GeneralUtilities; import net.minecraft.sounds.SoundSource; @@ -12,16 +12,16 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class SmokeBombItem extends Item { +public class SmokeGrenadeItem extends Item { private final int color; /** - * Constructor for SmokeBombItem. + * Constructor for SmokeGrenadeItem. * * @param properties the Properties for the item */ - public SmokeBombItem(Properties properties, int color) { + public SmokeGrenadeItem(Properties properties, int color) { super(properties); this.color = color; } @@ -42,11 +42,11 @@ public SmokeBombItem(Properties properties, int color) { 0.5F, 0.4F / (GeneralUtilities.getRandomNumber(0.2f, 0.6f) + 0.8F)); if (!worldIn.isClientSide) { - SmokeBombEntity.setColor(color); - SmokeBombEntity smokeBombEntity = new SmokeBombEntity(worldIn, playerIn); - smokeBombEntity.setItem(itemInHand); - smokeBombEntity.shootFromRotation(playerIn, playerIn.xRot, playerIn.yRot, -20.0F, 0.5F, 1.0F); - worldIn.addFreshEntity(smokeBombEntity); + SmokeGrenadeEntity.setColor(color); + SmokeGrenadeEntity smokeGrenadeEntity = new SmokeGrenadeEntity(worldIn, playerIn); + smokeGrenadeEntity.setItem(itemInHand); + smokeGrenadeEntity.shootFromRotation(playerIn, playerIn.xRot, playerIn.yRot, -20.0F, 0.5F, 1.0F); + worldIn.addFreshEntity(smokeGrenadeEntity); } if (!playerIn.isCreative()) { diff --git a/src/main/resources/assets/immersiveweapons/lang/en_us.json b/src/main/resources/assets/immersiveweapons/lang/en_us.json index 30425a2d9..57192a6ec 100644 --- a/src/main/resources/assets/immersiveweapons/lang/en_us.json +++ b/src/main/resources/assets/immersiveweapons/lang/en_us.json @@ -25,7 +25,7 @@ "item.immersiveweapons.copper_chestplate": "Copper Chestplate", "item.immersiveweapons.copper_leggings": "Copper Leggings", "item.immersiveweapons.copper_boots": "Copper Boots", - "item.immersiveweapons.wood_tool_rod": "Wooden Tool Rod", + "item.immersiveweapons.wooden_tool_rod": "Wooden Tool Rod", "item.immersiveweapons.copper_pike": "Copper Pike", "item.immersiveweapons.copper_pike_head": "Copper Pike Head", "item.immersiveweapons.copper_nugget": "Copper Nugget", @@ -43,26 +43,25 @@ "item.immersiveweapons.stone_pike": "Stone Pike", "item.immersiveweapons.stone_shard": "Stone Shard", "item.immersiveweapons.stone_pike_head": "Stone Pike Head", - "item.immersiveweapons.wood_pike": "Wooden Pike", - "item.immersiveweapons.wood_pike_head": "Wooden Pike Head", - "item.immersiveweapons.wood_shard": "Wooden Shard", - "item.immersiveweapons.gold_pike": "Golden Pike", - "item.immersiveweapons.gold_pike_head": "Golden Pike Head", + "item.immersiveweapons.wooden_pike": "Wooden Pike", + "item.immersiveweapons.wooden_pike_head": "Wooden Pike Head", + "item.immersiveweapons.wooden_shard": "Wooden Shard", + "item.immersiveweapons.golden_pike": "Golden Pike", + "item.immersiveweapons.golden_pike_head": "Golden Pike Head", "item.immersiveweapons.iron_arrow": "Iron Arrow", "item.immersiveweapons.diamond_arrow": "Diamond Arrow", - "item.immersiveweapons.gold_arrow": "Golden Arrow", + "item.immersiveweapons.golden_arrow": "Golden Arrow", "item.immersiveweapons.stone_arrow": "Stone Arrow", - "item.immersiveweapons.wood_arrow": "Wooden Arrow", + "item.immersiveweapons.wooden_arrow": "Wooden Arrow", "item.immersiveweapons.netherite_arrow": "Netherite Arrow", "item.immersiveweapons.flintlock_pistol": "Flintlock Pistol", "item.immersiveweapons.copper_musket_ball": "Copper Musket Ball", - "item.immersiveweapons.wood_musket_ball": "Wooden Musket Ball", + "item.immersiveweapons.wooden_musket_ball": "Wooden Musket Ball", "item.immersiveweapons.stone_musket_ball": "Stone Musket Ball", "item.immersiveweapons.iron_musket_ball": "Iron Musket Ball", - "item.immersiveweapons.gold_musket_ball": "Golden Musket Ball", + "item.immersiveweapons.golden_musket_ball": "Golden Musket Ball", "item.immersiveweapons.diamond_musket_ball": "Diamond Musket Ball", "item.immersiveweapons.netherite_musket_ball": "Netherite Musket Ball", - "item.immersiveweapons.small_parts_iron": "Small Parts (Iron)", "item.immersiveweapons.flintlock_assembly": "Flintlock Assembly", "item.immersiveweapons.trigger_assembly": "Trigger Assembly", "item.immersiveweapons.heavy_wooden_stock": "Heavy Wooden Stock", @@ -73,21 +72,21 @@ "item.immersiveweapons.wide_golden_barrel": "Wide Golden Barrel", "item.immersiveweapons.scope_mount": "Scope Mount", "item.immersiveweapons.scope": "Scope", - "item.immersiveweapons.smoke_bomb": "Smoke Bomb", + "item.immersiveweapons.smoke_grenade": "Smoke Grenade", "item.immersiveweapons.smoke_powder": "Smoke Powder", - "item.immersiveweapons.small_parts_metal_throwable_bomb": "Small Parts (Generic Metal, Throwable Bomb)", + "item.immersiveweapons.grenade_assembly": "Grenade Assembly", "item.immersiveweapons.mortar_and_pestle": "Mortar and Pestle", - "item.immersiveweapons.smoke_bomb_arrow": "Smoke Bomb Arrow", - "item.immersiveweapons.smoke_bomb_red": "Smoke Bomb (Red)", - "item.immersiveweapons.smoke_bomb_green": "Smoke Bomb (Green)", - "item.immersiveweapons.smoke_bomb_blue": "Smoke Bomb (Blue)", - "item.immersiveweapons.smoke_bomb_purple": "Smoke Bomb (Purple)", - "item.immersiveweapons.smoke_bomb_yellow": "Smoke Bomb (Yellow)", - "item.immersiveweapons.smoke_bomb_arrow_red": "Smoke Bomb Arrow (Red)", - "item.immersiveweapons.smoke_bomb_arrow_green": "Smoke Bomb Arrow (Green)", - "item.immersiveweapons.smoke_bomb_arrow_blue": "Smoke Bomb Arrow (Blue)", - "item.immersiveweapons.smoke_bomb_arrow_purple": "Smoke Bomb Arrow (Purple)", - "item.immersiveweapons.smoke_bomb_arrow_yellow": "Smoke Bomb Arrow (Yellow)", + "item.immersiveweapons.smoke_grenade_arrow": "Smoke Grenade Arrow", + "item.immersiveweapons.smoke_grenade_red": "Smoke Grenade (Red)", + "item.immersiveweapons.smoke_grenade_green": "Smoke Grenade (Green)", + "item.immersiveweapons.smoke_grenade_blue": "Smoke Grenade (Blue)", + "item.immersiveweapons.smoke_grenade_purple": "Smoke Grenade (Purple)", + "item.immersiveweapons.smoke_grenade_yellow": "Smoke Grenade (Yellow)", + "item.immersiveweapons.smoke_grenade_arrow_red": "Smoke Grenade Arrow (Red)", + "item.immersiveweapons.smoke_grenade_arrow_green": "Smoke Grenade Arrow (Green)", + "item.immersiveweapons.smoke_grenade_arrow_blue": "Smoke Grenade Arrow (Blue)", + "item.immersiveweapons.smoke_grenade_arrow_purple": "Smoke Grenade Arrow (Purple)", + "item.immersiveweapons.smoke_grenade_arrow_yellow": "Smoke Grenade Arrow (Yellow)", "item.immersiveweapons.molotov_cocktail": "Molotov Cocktail", "item.immersiveweapons.bottle_of_alcohol": "Bottle of Alcohol", "item.immersiveweapons.bottle_of_wine": "Bottle of Wine", @@ -97,7 +96,7 @@ "item.immersiveweapons.tesla_hoe": "Tesla Hoe", "item.immersiveweapons.blunderbuss": "Blunderbuss", "item.immersiveweapons.pliers": "Pliers", - "item.immersiveweapons.small_parts_metal_tool": "Small Parts (Generic Metal, Tool)", + "item.immersiveweapons.tool_joint": "Tool Joint", "item.immersiveweapons.chocolate_bar": "Chocolate Bar", "item.immersiveweapons.explosive_chocolate_bar": "Chocolate Bar", "item.immersiveweapons.dying_soldier_spawn_egg": "Dying Soldier Spawn Egg", @@ -146,9 +145,9 @@ "item.immersiveweapons.mortar_shell": "Mortar Shell", "item.immersiveweapons.burned_oak_boat": "Burned Oak Boat", "item.immersiveweapons.gauntlet_scaffolding": "Gauntlet Scaffolding", - "item.immersiveweapons.wood_gauntlet": "Wooden Gauntlet", + "item.immersiveweapons.wooden_gauntlet": "Wooden Gauntlet", "item.immersiveweapons.stone_gauntlet": "Stone Gauntlet", - "item.immersiveweapons.gold_gauntlet": "Golden Gauntlet", + "item.immersiveweapons.golden_gauntlet": "Golden Gauntlet", "item.immersiveweapons.copper_gauntlet": "Copper Gauntlet", "item.immersiveweapons.iron_gauntlet": "Iron Gauntlet", "item.immersiveweapons.cobalt_gauntlet": "Cobalt Gauntlet", @@ -279,25 +278,25 @@ "entity.immersiveweapons.field_medic": "Field Medic", "entity.immersiveweapons.wandering_warrior": "Wandering Warrior", "entity.immersiveweapons.hans": "Hans The Almighty", - "entity.immersiveweapons.wood_arrow": "Wood Arrow", + "entity.immersiveweapons.wooden_arrow": "Wooden Arrow", "entity.immersiveweapons.stone_arrow": "Stone Arrow", - "entity.immersiveweapons.gold_arrow": "Golden Arrow", + "entity.immersiveweapons.golden_arrow": "Golden Arrow", "entity.immersiveweapons.copper_arrow": "Copper Arrow", "entity.immersiveweapons.iron_arrow": "Iron Arrow", "entity.immersiveweapons.cobalt_arrow": "Cobalt Arrow", "entity.immersiveweapons.diamond_arrow": "Diamond Arrow", "entity.immersiveweapons.netherite_arrow": "Netherite Arrow", - "entity.immersiveweapons.wood_musket_ball": "Wood Musket Ball", + "entity.immersiveweapons.wooden_musket_ball": "Wooden Musket Ball", "entity.immersiveweapons.stone_musket_ball": "Stone Musket Ball", - "entity.immersiveweapons.gold_musket_ball": "Golden Musket Ball", + "entity.immersiveweapons.golden_musket_ball": "Golden Musket Ball", "entity.immersiveweapons.copper_musket_ball": "Copper Musket Ball", "entity.immersiveweapons.iron_musket_ball": "Iron Musket Ball", "entity.immersiveweapons.cobalt_musket_ball": "Cobalt Musket Ball", "entity.immersiveweapons.diamond_musket_ball": "Diamond Musket Ball", "entity.immersiveweapons.netherite_musket_ball": "Netherite Musket Ball", "entity.immersiveweapons.flare": "Flare", - "entity.immersiveweapons.smoke_bomb": "Smoke Bomb", - "entity.immersiveweapons.smoke_bomb_arrow": "Smoke Bomb Arrow", + "entity.immersiveweapons.smoke_grenade": "Smoke Grenade", + "entity.immersiveweapons.smoke_grenade_arrow": "Smoke Grenade Arrow", "entity.immersiveweapons.molotov_cocktail": "Molotov Cocktail", "entity.immersiveweapons.mortar_shell": "Mortar Shell", "entity.immersiveweapons.burned_oak_boat": "Burned Oak Boat", @@ -322,7 +321,7 @@ "immersiveweapons.subtitle.item.gun.bullet_whizz": "Bullet whizzes", "immersiveweapons.subtitle.item.gun.flintlock_misfire": "Gun misfires", "immersiveweapons.subtitle.block.small_parts_table_used": "Small parts table used", - "immersiveweapons.subtitle.item.smoke_bomb_hiss": "Smoke bomb hissing", + "immersiveweapons.subtitle.item.smoke_grenade_hiss": "Smoke grenade hissing", "immersiveweapons.subtitle.item.generic_whoosh": "Item flies", "immersiveweapons.subtitle.item.gun.blunderbuss_fire": "Blunderbuss fires", "immersiveweapons.subtitle.block.barbed_wire_rattle": "Barbed wire rattles", @@ -363,21 +362,21 @@ "immersiveweapons.tooltip.molten_sword": "Kill it with fire", "immersiveweapons.tooltip.tesla_sword": "Provides quite a shocking experience", "immersiveweapons.tooltip.ventus_sword": "Whoosh", - "immersiveweapons.tooltip.flintlock_pistol": "A basic flintlock firearm that excels in mid-range combat.", + "immersiveweapons.tooltip.flintlock_pistol": "A basic flintlock firearm that excels in medium-range combat.", "immersiveweapons.tooltip.blunderbuss": "Good for hordes a short distance away. A primitive type of shotgun.", "immersiveweapons.tooltip.musket": "A simple firearm designed for long-range combat.", "immersiveweapons.tooltip.copper_arrow": "15% more powerful than normal arrows", "immersiveweapons.tooltip.iron_arrow": "35% more powerful than normal arrows", "immersiveweapons.tooltip.cobalt_arrow": "55% more powerful than normal arrows", "immersiveweapons.tooltip.diamond_arrow": "100% more powerful than normal arrows", - "immersiveweapons.tooltip.gold_arrow": "10% more powerful than normal arrows", + "immersiveweapons.tooltip.golden_arrow": "10% more powerful than normal arrows", "immersiveweapons.tooltip.stone_arrow": "15% less powerful than normal arrows. Kind of dull and weighs at least a pound.", - "immersiveweapons.tooltip.wood_arrow": "35% less powerful than normal arrows. Highly inaccurate. At this point it's just blunt-force trauma.", + "immersiveweapons.tooltip.wooden_arrow": "35% less powerful than normal arrows. Highly inaccurate. At this point it's just blunt-force trauma.", "immersiveweapons.tooltip.netherite_arrow": "375% more powerful than normal arrows. Extremely sharp, powerful, and accurate. How can you even afford to shoot these?", - "immersiveweapons.tooltip.smoke_bomb_arrow": "Obscure your enemy's vision", - "immersiveweapons.tooltip.wood_musket_ball": "Very inaccurate, and likely to cause a misfire. Why would anyone make wooden musket balls anyway?", + "immersiveweapons.tooltip.smoke_grenade_arrow": "Obscure your enemy's vision", + "immersiveweapons.tooltip.wooden_musket_ball": "Very inaccurate, and likely to cause a misfire. Why would anyone make wooden musket balls anyway?", "immersiveweapons.tooltip.stone_musket_ball": "A very heavy musket ball, and not too accurate. Less likely to cause a misfire than wooden ones.", - "immersiveweapons.tooltip.gold_musket_ball": "Fancier than stone musket balls, but not much better. At least it won't misfire. Look at me! I have money to throw away!", + "immersiveweapons.tooltip.golden_musket_ball": "Fancier than stone musket balls, but not much better. At least it won't misfire. Look at me! I have money to throw away!", "immersiveweapons.tooltip.copper_musket_ball": "A well constructed musket ball, made from copper.", "immersiveweapons.tooltip.iron_musket_ball": "A hard hitting musket ball, made from iron.", "immersiveweapons.tooltip.cobalt_musket_ball": "A strong and dense musket ball, made from cobalt.", @@ -387,12 +386,12 @@ "immersiveweapons.tooltip.molten_armor": "Warm and toasty inside. Allows submersion in lava without burning, and improves vision/movement.", "immersiveweapons.tooltip.tesla_armor": "The EMF emitted makes nearby enemies sick (Toggleable with your Armor Effect Toggle key)", "immersiveweapons.tooltip.ventus_armor": "Unlocks a 13.1ft vertical and makes you as light as a feather (Toggleable with your Armor Effect Toggle key)", - "immersiveweapons.tooltip.smoke_bomb": "Creates a thick cloud of smoke upon impact. Good for quickly escaping a situation.", - "immersiveweapons.tooltip.smoke_bomb_red": "This one releases red smoke.", - "immersiveweapons.tooltip.smoke_bomb_green": "This one releases green smoke.", - "immersiveweapons.tooltip.smoke_bomb_blue": "This one releases blue smoke.", - "immersiveweapons.tooltip.smoke_bomb_purple": "This one releases purple smoke.", - "immersiveweapons.tooltip.smoke_bomb_yellow": "This one releases yellow smoke.", + "immersiveweapons.tooltip.smoke_grenade": "Creates a thick cloud of smoke upon impact. Good for quickly escaping a situation.", + "immersiveweapons.tooltip.smoke_grenade_red": "This one releases red smoke.", + "immersiveweapons.tooltip.smoke_grenade_green": "This one releases green smoke.", + "immersiveweapons.tooltip.smoke_grenade_blue": "This one releases blue smoke.", + "immersiveweapons.tooltip.smoke_grenade_purple": "This one releases purple smoke.", + "immersiveweapons.tooltip.smoke_grenade_yellow": "This one releases yellow smoke.", "immersiveweapons.tooltip.molotov_cocktail": "Creates a ring of fire upon impact.", "immersiveweapons.tooltip.bottle_of_alcohol": "You could drink this, but you'll be nauseous. Highly flammable!", "immersiveweapons.tooltip.bottle_of_wine": "A relaxing combination of sweet berries", @@ -412,9 +411,9 @@ "immersiveweapons.tooltip.hans_spawn_egg": "Summon Hans the Almighty into this world", "immersiveweapons.tooltip.flare_gun": "Launch bright flares into the sky", "immersiveweapons.tooltip.gauntlet": "Beat the life out of your opponents.", - "immersiveweapons.tooltip.wood_gauntlet": "Has a 15% chance to inflict Bleeding.", + "immersiveweapons.tooltip.wooden_gauntlet": "Has a 15% chance to inflict Bleeding.", "immersiveweapons.tooltip.stone_gauntlet": "Has a 25% chance to inflict Bleeding.", - "immersiveweapons.tooltip.gold_gauntlet": "Has a 35% chance to inflict Bleeding.", + "immersiveweapons.tooltip.golden_gauntlet": "Has a 35% chance to inflict Bleeding.", "immersiveweapons.tooltip.copper_gauntlet": "Has a 45% chance to inflict Bleeding.", "immersiveweapons.tooltip.iron_gauntlet": "Has a 55% chance to inflict Bleeding.", "immersiveweapons.tooltip.cobalt_gauntlet": "Has a 60% chance to inflict Bleeding.", @@ -519,8 +518,8 @@ "advancements.immersiveweapons.musket.description": "Craft a musket", "advancements.immersiveweapons.shards.title": "Sharp Shrapnel", "advancements.immersiveweapons.shards.description": "Obtain any shard", - "advancements.immersiveweapons.wood_shard.title": "Shards: Wood", - "advancements.immersiveweapons.wood_shard.description": "Obtain a wooden shard", + "advancements.immersiveweapons.wooden_shard.title": "Shards: Wood", + "advancements.immersiveweapons.wooden_shard.description": "Obtain a wooden shard", "advancements.immersiveweapons.stone_shard.title": "Shards: Stone", "advancements.immersiveweapons.stone_shard.description": "Obtain a stone shard", "advancements.immersiveweapons.diamond_shard.title": "Shards: Diamond", @@ -531,8 +530,8 @@ "advancements.immersiveweapons.musket_ball.description": "Obtain any musket ball", "advancements.immersiveweapons.netherite_projectile.title": "Throwing Away Money", "advancements.immersiveweapons.netherite_projectile.description": "Obtain a netherite arrow and musket ball", - "advancements.immersiveweapons.smoke_bomb.title": "Sight Privileges Revoked", - "advancements.immersiveweapons.smoke_bomb.description": "Craft a smoke bomb", + "advancements.immersiveweapons.smoke_grenade.title": "Sight Privileges Revoked", + "advancements.immersiveweapons.smoke_grenade.description": "Craft a smoke grenade", "advancements.immersiveweapons.molotov_cocktail.title": "Quick-Use Arson", "advancements.immersiveweapons.molotov_cocktail.description": "Craft a molotov cocktail", "advancements.immersiveweapons.bottle_of_alcohol.title": "mmmmm alacol", @@ -659,7 +658,7 @@ "immersiveweapons.lorebook.killed_entity_tiers.kill_em_all": "By now, you've probably killed 'em all!", "config.immersiveweapons.tesla_armor_effect_sound": "Enable the Tesla Armor effect sound - Default true", "config.immersiveweapons.panic_alarm_range": "Set the range of the Panic Alarm's sound - Default 48", - "config.immersiveweapons.max_smoke_bomb_particles": "Set the maximum number of particles produced by the smoke bomb - Default 96\nSetting this higher can make clients laggy, setting to 0 effectively disables it", + "config.immersiveweapons.max_smoke_grenade_particles": "Set the maximum number of particles produced by the smoke grenade - Default 96\nSetting this higher can make clients laggy, setting to 0 effectively disables it", "config.immersiveweapons.bullets_break_glass": "Enable bullets breaking glass - Default true", "config.immersiveweapons.tiltros_enabled": "Enable the Tiltros dimension portal - Default true", "config.immersiveweapons.celestial_tower_spawn_check_radius": "Set the spawn checking radius for the Celestial Tower.\nSetting this higher may slightly negatively impact server ticks in Tiltros, but make Celestial Lanterns more effective - Default 128", diff --git a/src/main/resources/assets/immersiveweapons/models/item/gold_gauntlet.json b/src/main/resources/assets/immersiveweapons/models/item/golden_gauntlet.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/gold_gauntlet.json rename to src/main/resources/assets/immersiveweapons/models/item/golden_gauntlet.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/wood_musket_ball.json b/src/main/resources/assets/immersiveweapons/models/item/golden_musket_ball.json similarity index 97% rename from src/main/resources/assets/immersiveweapons/models/item/wood_musket_ball.json rename to src/main/resources/assets/immersiveweapons/models/item/golden_musket_ball.json index b8e0da29a..fa0dd2ef7 100644 --- a/src/main/resources/assets/immersiveweapons/models/item/wood_musket_ball.json +++ b/src/main/resources/assets/immersiveweapons/models/item/golden_musket_ball.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "immersiveweapons:item/wood_musket_ball", - "particle": "immersiveweapons:item/wood_musket_ball" + "0": "immersiveweapons:item/golden_musket_ball", + "particle": "immersiveweapons:item/golden_musket_ball" }, "elements": [ { diff --git a/src/main/resources/assets/immersiveweapons/models/item/gold_pike.json b/src/main/resources/assets/immersiveweapons/models/item/golden_pike.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/gold_pike.json rename to src/main/resources/assets/immersiveweapons/models/item/golden_pike.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_blue.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_blue.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_blue.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_blue.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_green.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_green.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_green.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_green.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_purple.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_purple.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_purple.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_purple.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_red.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_red.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_red.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_red.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_yellow.json b/src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_yellow.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/smoke_bomb_yellow.json rename to src/main/resources/assets/immersiveweapons/models/item/smoke_grenade_yellow.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/wood_gauntlet.json b/src/main/resources/assets/immersiveweapons/models/item/wooden_gauntlet.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/wood_gauntlet.json rename to src/main/resources/assets/immersiveweapons/models/item/wooden_gauntlet.json diff --git a/src/main/resources/assets/immersiveweapons/models/item/gold_musket_ball.json b/src/main/resources/assets/immersiveweapons/models/item/wooden_musket_ball.json similarity index 97% rename from src/main/resources/assets/immersiveweapons/models/item/gold_musket_ball.json rename to src/main/resources/assets/immersiveweapons/models/item/wooden_musket_ball.json index 46d179a93..81ba56501 100644 --- a/src/main/resources/assets/immersiveweapons/models/item/gold_musket_ball.json +++ b/src/main/resources/assets/immersiveweapons/models/item/wooden_musket_ball.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "immersiveweapons:item/gold_musket_ball", - "particle": "immersiveweapons:item/gold_musket_ball" + "0": "immersiveweapons:item/wooden_musket_ball", + "particle": "immersiveweapons:item/wooden_musket_ball" }, "elements": [ { diff --git a/src/main/resources/assets/immersiveweapons/models/item/wood_pike.json b/src/main/resources/assets/immersiveweapons/models/item/wooden_pike.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/models/item/wood_pike.json rename to src/main/resources/assets/immersiveweapons/models/item/wooden_pike.json diff --git a/src/main/resources/assets/immersiveweapons/particles/smoke_bomb.json b/src/main/resources/assets/immersiveweapons/particles/smoke_grenade.json similarity index 100% rename from src/main/resources/assets/immersiveweapons/particles/smoke_bomb.json rename to src/main/resources/assets/immersiveweapons/particles/smoke_grenade.json diff --git a/src/main/resources/assets/immersiveweapons/sounds.json b/src/main/resources/assets/immersiveweapons/sounds.json index 84fb20390..222825032 100644 --- a/src/main/resources/assets/immersiveweapons/sounds.json +++ b/src/main/resources/assets/immersiveweapons/sounds.json @@ -85,11 +85,11 @@ } ] }, - "smoke_bomb_hiss": { - "subtitle": "immersiveweapons.subtitle.item.smoke_bomb_hiss", + "smoke_grenade_hiss": { + "subtitle": "immersiveweapons.subtitle.item.smoke_grenade_hiss", "sounds": [ { - "name": "immersiveweapons:smoke_bomb_hiss", + "name": "immersiveweapons:smoke_grenade_hiss", "stream": true } ] diff --git a/src/main/resources/assets/immersiveweapons/sounds/smoke_bomb_hiss.ogg b/src/main/resources/assets/immersiveweapons/sounds/smoke_grenade_hiss.ogg similarity index 100% rename from src/main/resources/assets/immersiveweapons/sounds/smoke_bomb_hiss.ogg rename to src/main/resources/assets/immersiveweapons/sounds/smoke_grenade_hiss.ogg diff --git a/src/main/resources/assets/immersiveweapons/textures/item/gold_arrow.png b/src/main/resources/assets/immersiveweapons/textures/item/golden_arrow.png similarity index 100% rename from src/main/resources/assets/immersiveweapons/textures/item/gold_arrow.png rename to src/main/resources/assets/immersiveweapons/textures/item/golden_arrow.png diff --git a/src/main/resources/assets/immersiveweapons/textures/item/gold_musket_ball.png b/src/main/resources/assets/immersiveweapons/textures/item/golden_musket_ball.png similarity index 100% rename from src/main/resources/assets/immersiveweapons/textures/item/gold_musket_ball.png rename to src/main/resources/assets/immersiveweapons/textures/item/golden_musket_ball.png diff --git a/src/main/resources/assets/immersiveweapons/textures/item/gold_pike_head.png b/src/main/resources/assets/immersiveweapons/textures/item/golden_pike_head.png similarity index 100% rename from src/main/resources/assets/immersiveweapons/textures/item/gold_pike_head.png rename to src/main/resources/assets/immersiveweapons/textures/item/golden_pike_head.png diff --git a/src/main/resources/assets/immersiveweapons/textures/item/grenade_assembly.png b/src/main/resources/assets/immersiveweapons/textures/item/grenade_assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..14e69970f8a5c6ad1f60eee849560f582519c79c GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F3${@^GvDCf{D9B#o z>Fdh=jEz~$z?30LH5n+B@9E+gVsZNIgtMFn6nNb1WzS63W|1*`z%_5qaZV;7|7qJq zw%Bi(Zg)a)LJcSX4=H0Q4#gL{(x08}lV!aU73dXt%5wQ~yB8JjMHyUJEYpquI;t-% zsW@|Q>W>-*!Iw`NlrBjuetGCy$B8{}ugm;l;0>Lxb|ibf&|{$044$rjF6*2UngI9= BMUemi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersiveweapons/textures/item/small_parts_metal_throwable_bomb.png b/src/main/resources/assets/immersiveweapons/textures/item/small_parts_metal_throwable_bomb.png deleted file mode 100644 index bc2ea96643c4a110dd9f3adbd8a3cb5d33f3af87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpdfpR zr>`sfGe!anMpdfpR zr>`sfGe!X?_wfUrhf^q>qA+A6=AtAxe&MqP%0?2T2aRHJ*@aWMaAo=4+^dF!Ku96_XUB4m}hlk_)^Ube%)e|>vPsfwf`Tm^m z>G@yp%$K}1Xpi~mpqc;GTD5hv9=(2gSkIcZ^=j)@Q_t?qW0@bd>mP4-@z!K~dh^bl zpZ4at{#?7k^Y4GP>giY8a8(jNNFYJG56y>D=GGJo-n=6+M3jz`ny z4(D6DKW(?MO=02io_z3^ZhrWqKR^7n-~08Wzxj%{R8)fc2_#V=#YN``}u&`O4^}NxScdYpt8F zjb~@+p6$bnAHF%e5M#d7%d_U>T-x)kfB$1!e>5D7X2bEp-Tl*chsVRUs&{jKRM%R| zXZ3NX+PGDp)W=PQa8KNrw6-rDyDrC$@2#ry>Ues#r(dgI{o_CS&)@34@C)ZdeC^IF zpZ)v4`mukHu2p#Bqh12T)#!37K zFa7!7KJ)dL!b$wCfBEj8ec<}WT`KDYw-@e7k z<4xQBcIEuY>HH?ns`os6@wBzMIc(qY?lt@4$-$k$W0U`t+jH$sJvu(q`jNFRFfj<*0+m>+MW)MNA+-jevy6om!09@a@M+f0=VK5eR*|7 z#y@^>xNPoxQyx1{iO$o#;wWBR{XS;QY29AcbdTC=*rh#c-{i*!2lq|~m&fF)eLTA; qnP0wLJ#Kr-9e!`)cB<`L^{oEI`I$E!wHL+juKpVvqFtoI>i__=GY(Y% delta 868 zcmV-q1DpJ`F}N|XApw6{r`meuw3*bi!FV+PdAsVq{`$+e+W+nT?s)vupMUX{TYvI} zAN|6w-u=hfMzwL{WPEQld;ZRMzVW5^e&=bn;;Gl_(c$>y+39J0fAs9_@#x;P;)x+V(h7Sg#fz1tcz8IzKi{9KS3Pm#_H;Zso$uiJ z=AZxd&V0#RgZ7w@4x0I2tyNn$>(T3{hxM#kTd%fmHTCSyJeK)UyZ-TZ7jI3*r#J7+ z`Dt&S>(8|tJpX@QtDb(fJ)Z4YP5atw&1dfoChei$tkwsI)%yk~C-WEIXzn-l>3B4K z?r^@f`_pzC+Y}a#_sIu;>E?$&`t!qI`@LU3`kUYQ^7dA>@yYRgvo|gTJNx?TSDxy9 z{Wm}J6a3t(Ha_0e!`Yo1e>mTV{wJEF*?eQ$4Op)_HwJ%`wGXaUo3D&snzZ|VxYoM) z+IV&r_t`$Y_~Dzg3o+(Py*z79&ZRxy`u9J!^+&_OXf_-l+}%HIcX&Kpt9m!*M|G{W zd{!TKs*PLqNqyW@2=~N|No)JkvFmc|_};2Iua2i@d-}Ed)j$5D|NO1)3%_ta#Mkb; z^4Y)ts~>;+=z7)tSbJc<``!8JF(31CW4q`1?Y8;7Iykud`spXe<5|1=oAYz)Ji>NE zHgC^2yIl(>Z0~HTs@iQ=etNO;7vAx&|Mvb5{nO{4|MvOHU--c0xBlZxUpTG)kDkQe z`j_wi*$00A#%o{wosBQP^F#mj*AGwPKX~cS|Mmo#ufO!Op94n}fA_I>_jWQqY(^`l z+_yM?ylKJTuBab5qu<1d^`3_>p0+|ahwYo*y=H$rIk+=;Z2rG;d#>H7N5^MoKeE<^ zDB8D@cCk^>Xx-U^_Pm*&%2&NHot-1Y`gYM!+tb1Es2=Xmud^@zvNIf9PFz>d0ask5 zFR!jh`p2&im*t&rQp#iJ(RsR89L0+Z;Kz(Pt=kKm?ooRgyR=8``~3Le;NI!r@|aw; uk7w5<^DDTk$8FEL!|!d}PPKijp4GoNKl#R^_PY4p)qexL$6F`G>i_`wx)q@S