diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index b88af74ce..3bfb41f18 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,49 +1,55 @@ -// 1.20.1 2025-03-16T14:52:45.5328972 Tags for minecraft:item mod id superbwarfare -cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json -0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json -295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json -5ed781a6ce735a9a6555bd1dcc43300c64c2bad0 data/forge/tags/items/dusts/tungsten.json -8090ca42d38b4db1ad444641b49b8bae77cbd5ce data/forge/tags/items/ingots.json -6a3ef6343dbc199446979cb92e7421483025b9e0 data/forge/tags/items/ingots/lead.json -b870c0a22be2fdb67b8f4eac9a429a009fd47c10 data/forge/tags/items/ingots/silver.json -a31040302a0327e638bbc8cc2dda514e56934f16 data/forge/tags/items/ingots/steel.json -534d88c2973775b785ad048f16cde5121f256acc data/forge/tags/items/ingots/tungsten.json -de439a73e17071f118f37d948be6768fd4b237fd data/forge/tags/items/ores.json -af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/forge/tags/items/ores/lead.json -6b4ec9b667b534e868b5463f06acf89fe114be9a data/forge/tags/items/ores/silver.json -65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/forge/tags/items/ores/tungsten.json -91ca1b4d467e94a2f407f7465b3cadade7ff661b data/forge/tags/items/ores_in_ground/deepslate.json -2227e4cdbfc8a9c9af4975fa5ed1360146623768 data/forge/tags/items/ores_in_ground/stone.json -7d161c1baae850baa9fc50e89c73f1eeb51a2e47 data/forge/tags/items/ore_rates/singular.json -140a8470d41a4fe0bb7c9e121a94d926fb6117b1 data/forge/tags/items/plates.json -51189baa4881d4137d853012976d10cc44f3092e data/forge/tags/items/plates/copper.json -6b9abe5e1a7307e68849ab1ddcfe77e145e80cbf data/forge/tags/items/raw_materials.json -08cf183386837d6d22b7ee1315758e479adf82d8 data/forge/tags/items/raw_materials/lead.json -5aa8ba2e6cba7b4c8b34115d4f9528522b71a549 data/forge/tags/items/raw_materials/silver.json -01d117b3c36039399a63c89f32ee0cc0abfee66a data/forge/tags/items/raw_materials/tungsten.json -1a9ff319ed4af1df0283c5be2f75ab4563eb9363 data/forge/tags/items/storage_blocks.json -af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/lead.json -30d1daa7590f7364b5bc2dc777a00caf2f5eecb0 data/forge/tags/items/storage_blocks/silver.json -3743c2790deca7e779d3e4b82f092de39b446988 data/forge/tags/items/storage_blocks/steel.json -144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json -748a5e10c7eb644efcfbce889daff4d68a0ceb2b data/superbwarfare/tags/items/gun.json -409af265147e812b6f6558c51f1cb83b0f61b7d3 data/superbwarfare/tags/items/handgun.json -0ab1b2a8f5433e0d1b03446a9d0d9428e9d64feb data/superbwarfare/tags/items/heavy_weapon.json -3cc00928c041f710b50eb1f7a817e0345f6f96b3 data/superbwarfare/tags/items/ingots/cemented_carbide.json -9b38dc57a6ea6b75f183dfe6376190aaf5b575f0 data/superbwarfare/tags/items/ingots/steel.json -65ddb0a8a671cc65af8e3754fc23e7d24c3587b7 data/superbwarfare/tags/items/launcher.json -b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json -a53020091752016da6602ee1b8b7e08823614344 data/superbwarfare/tags/items/military_armor.json -57750741ce5781bb44a44f0d085c6abc2b4651b6 data/superbwarfare/tags/items/normal_gun.json -15328cd564c931cc0a4fc000596240f93a7b29a1 data/superbwarfare/tags/items/revolver.json -aaa533157491a82b8e23b2914deef67c4078cbed data/superbwarfare/tags/items/rifle.json -a249d9d052cdc24b34e0e51ab991329f6c76e8ab data/superbwarfare/tags/items/shotgun.json -4aca0fa3f8b9f2a4920041e35e46dae7e93d5482 data/superbwarfare/tags/items/smg.json -7a12c751d024c06b3e88657afddc84fce8e13295 data/superbwarfare/tags/items/sniper_rifle.json -30a6a2a2031c2fc53accf833c1760697462c5b33 data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json -a391df0529d05dbae8f9bc6e9ddce039b63e545a data/superbwarfare/tags/items/storage_blocks/steel.json -9af8a0147d1e920ef2a2b990bc9010367cf3b7df data/superbwarfare/tags/items/use_handgun_ammo.json -0ab1b2a8f5433e0d1b03446a9d0d9428e9d64feb data/superbwarfare/tags/items/use_heavy_ammo.json -2899774c6325135847a85b09121ce25587aa275e data/superbwarfare/tags/items/use_rifle_ammo.json -a249d9d052cdc24b34e0e51ab991329f6c76e8ab data/superbwarfare/tags/items/use_shotgun_ammo.json -7a12c751d024c06b3e88657afddc84fce8e13295 data/superbwarfare/tags/items/use_sniper_ammo.json +// 1.21.1 2025-03-27T19:21:19.6262589 Tags for minecraft:item mod id superbwarfare +44a232152f5941d0435a35483b37f8ed22fd10bf data/c/tags/item/dusts.json +0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/c/tags/item/dusts/coal_coke.json +295ddf906b7133a0558d03e9a60eea18281fe430 data/c/tags/item/dusts/iron.json +5ed781a6ce735a9a6555bd1dcc43300c64c2bad0 data/c/tags/item/dusts/tungsten.json +7d01dfb7bac0fc9a3c1f85ada522adde63dbb3f4 data/c/tags/item/ingots.json +6a3ef6343dbc199446979cb92e7421483025b9e0 data/c/tags/item/ingots/lead.json +b870c0a22be2fdb67b8f4eac9a429a009fd47c10 data/c/tags/item/ingots/silver.json +a31040302a0327e638bbc8cc2dda514e56934f16 data/c/tags/item/ingots/steel.json +534d88c2973775b785ad048f16cde5121f256acc data/c/tags/item/ingots/tungsten.json +d3607e34f27546886470700c887fcc13572b29ad data/c/tags/item/ores.json +af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/c/tags/item/ores/lead.json +6b4ec9b667b534e868b5463f06acf89fe114be9a data/c/tags/item/ores/silver.json +65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/c/tags/item/ores/tungsten.json +91ca1b4d467e94a2f407f7465b3cadade7ff661b data/c/tags/item/ores_in_ground/deepslate.json +2227e4cdbfc8a9c9af4975fa5ed1360146623768 data/c/tags/item/ores_in_ground/stone.json +7d161c1baae850baa9fc50e89c73f1eeb51a2e47 data/c/tags/item/ore_rates/singular.json +a37e57d3dd5a68c82c2b6845157f9a01df7f0f03 data/c/tags/item/plates.json +51189baa4881d4137d853012976d10cc44f3092e data/c/tags/item/plates/copper.json +43cb7777244cfac917ea2125ef3087046af38551 data/c/tags/item/raw_materials.json +08cf183386837d6d22b7ee1315758e479adf82d8 data/c/tags/item/raw_materials/lead.json +5aa8ba2e6cba7b4c8b34115d4f9528522b71a549 data/c/tags/item/raw_materials/silver.json +01d117b3c36039399a63c89f32ee0cc0abfee66a data/c/tags/item/raw_materials/tungsten.json +b99f66f3837b185a3e76491505213024873a085e data/c/tags/item/storage_blocks.json +af6fd64b4a685c353f243763db268f7b2304c009 data/c/tags/item/storage_blocks/lead.json +30d1daa7590f7364b5bc2dc777a00caf2f5eecb0 data/c/tags/item/storage_blocks/silver.json +3743c2790deca7e779d3e4b82f092de39b446988 data/c/tags/item/storage_blocks/steel.json +144e54d908121dee498b2ebba3b24b09fd6f18d9 data/c/tags/item/storage_blocks/tungsten.json +362d41246c4c832d114e8b8942b105f4010d4ba0 data/superbwarfare/tags/item/blueprint.json +b2487459d95ca9a319bfbd94e60a48de60e07297 data/superbwarfare/tags/item/blueprint/cannon.json +889e4b56462df422f57191f07229009dcf2073e3 data/superbwarfare/tags/item/blueprint/common.json +2512dd03ae847ab6b4a9cc60d32ff3b3a5cdad82 data/superbwarfare/tags/item/blueprint/epic.json +8014c67b62b785b4b7e23d8e5aa70343c30b2fbd data/superbwarfare/tags/item/blueprint/legendary.json +2a49f09e9374bf7f355aae50be470169406ff2d3 data/superbwarfare/tags/item/blueprint/rare.json +748a5e10c7eb644efcfbce889daff4d68a0ceb2b data/superbwarfare/tags/item/gun.json +409af265147e812b6f6558c51f1cb83b0f61b7d3 data/superbwarfare/tags/item/handgun.json +0ab1b2a8f5433e0d1b03446a9d0d9428e9d64feb data/superbwarfare/tags/item/heavy_weapon.json +3cc00928c041f710b50eb1f7a817e0345f6f96b3 data/superbwarfare/tags/item/ingots/cemented_carbide.json +a1c6460b9c956972b74d5ad5cd206e9ae3560b03 data/superbwarfare/tags/item/ingots/steel.json +65ddb0a8a671cc65af8e3754fc23e7d24c3587b7 data/superbwarfare/tags/item/launcher.json +b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/item/machine_gun.json +a53020091752016da6602ee1b8b7e08823614344 data/superbwarfare/tags/item/military_armor.json +57750741ce5781bb44a44f0d085c6abc2b4651b6 data/superbwarfare/tags/item/normal_gun.json +15328cd564c931cc0a4fc000596240f93a7b29a1 data/superbwarfare/tags/item/revolver.json +aaa533157491a82b8e23b2914deef67c4078cbed data/superbwarfare/tags/item/rifle.json +a249d9d052cdc24b34e0e51ab991329f6c76e8ab data/superbwarfare/tags/item/shotgun.json +4aca0fa3f8b9f2a4920041e35e46dae7e93d5482 data/superbwarfare/tags/item/smg.json +7a12c751d024c06b3e88657afddc84fce8e13295 data/superbwarfare/tags/item/sniper_rifle.json +30a6a2a2031c2fc53accf833c1760697462c5b33 data/superbwarfare/tags/item/storage_blocks/cemented_carbide.json +de0d84361d5208127bff21e915987ec561cdef13 data/superbwarfare/tags/item/storage_blocks/steel.json +9af8a0147d1e920ef2a2b990bc9010367cf3b7df data/superbwarfare/tags/item/use_handgun_ammo.json +0ab1b2a8f5433e0d1b03446a9d0d9428e9d64feb data/superbwarfare/tags/item/use_heavy_ammo.json +2899774c6325135847a85b09121ce25587aa275e data/superbwarfare/tags/item/use_rifle_ammo.json +a249d9d052cdc24b34e0e51ab991329f6c76e8ab data/superbwarfare/tags/item/use_shotgun_ammo.json +7a12c751d024c06b3e88657afddc84fce8e13295 data/superbwarfare/tags/item/use_sniper_ammo.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 04d32f821..9ed2640db 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,21 +1,21 @@ -// 1.20.1 2025-01-24T23:42:51.1560585 Loot Tables -98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_tables/blocks/barbed_wire.json -811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json -89568ab53a9e33d332b9125c1acccc80db6eb5bc data/superbwarfare/loot_tables/blocks/charging_station.json -8ed3f1d518c86fe6ed14f14f3121c2e24e109269 data/superbwarfare/loot_tables/blocks/container.json -c7b613c897b0eeca4dbade5eb65f718015dcb853 data/superbwarfare/loot_tables/blocks/creative_charging_station.json -dabbe17417c944567dc6dfcdcba32b8377c24f69 data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json -a7c1af3e194d35a64544902468bd964f45f2f9ef data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json -76fa64ff714374c1655f4d11776fda132287a014 data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json -e80a153391c34dbca9130a140e6401242e3add4c data/superbwarfare/loot_tables/blocks/dragon_teeth.json -cd1305462caefccc6914a6fcc83caccf1a441e81 data/superbwarfare/loot_tables/blocks/fumo_25.json -cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/galena_ore.json -188ee13e38134e87d07ded14b35c60b488db9ef8 data/superbwarfare/loot_tables/blocks/jump_pad.json -26265463564b351c59c97d0ef8d2711e69c84a38 data/superbwarfare/loot_tables/blocks/lead_block.json -8216c47bb150112820b066eb1edbec51c7e61251 data/superbwarfare/loot_tables/blocks/reforging_table.json -8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_tables/blocks/sandbag.json -bce3fc7a50ba51c24ad3a37d2534a7db9cf0db73 data/superbwarfare/loot_tables/blocks/scheelite_ore.json -a223f61202cf9937e8be5b90791925bba09d17b9 data/superbwarfare/loot_tables/blocks/silver_block.json -015f852f7abbf1ecf2d730a61537b4e58b3e17bd data/superbwarfare/loot_tables/blocks/silver_ore.json -83112ebff477e322bd3d23ed4653c7c02b230473 data/superbwarfare/loot_tables/blocks/steel_block.json -71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_tables/blocks/tungsten_block.json +// 1.21.1 2025-03-27T19:46:28.646366 Loot Tables +98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_table/blocks/barbed_wire.json +811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_table/blocks/cemented_carbide_block.json +1f482bc1f0a1026d0e1b75ee28c6f541b56747a5 data/superbwarfare/loot_table/blocks/charging_station.json +e3d65cec9cd578df0c357c534ba64e2336ea05b7 data/superbwarfare/loot_table/blocks/container.json +c7b613c897b0eeca4dbade5eb65f718015dcb853 data/superbwarfare/loot_table/blocks/creative_charging_station.json +f75afc8822e651ec7106271385813e2c6a810866 data/superbwarfare/loot_table/blocks/deepslate_galena_ore.json +7e0186c30d572478bebcb62171c1c126801258c2 data/superbwarfare/loot_table/blocks/deepslate_scheelite_ore.json +b0638515482f53361ac10f1887189a3c84f28e89 data/superbwarfare/loot_table/blocks/deepslate_silver_ore.json +e80a153391c34dbca9130a140e6401242e3add4c data/superbwarfare/loot_table/blocks/dragon_teeth.json +cd1305462caefccc6914a6fcc83caccf1a441e81 data/superbwarfare/loot_table/blocks/fumo_25.json +ff3548e151685da812f1d5df1dff9fe365b5e0f9 data/superbwarfare/loot_table/blocks/galena_ore.json +188ee13e38134e87d07ded14b35c60b488db9ef8 data/superbwarfare/loot_table/blocks/jump_pad.json +26265463564b351c59c97d0ef8d2711e69c84a38 data/superbwarfare/loot_table/blocks/lead_block.json +8216c47bb150112820b066eb1edbec51c7e61251 data/superbwarfare/loot_table/blocks/reforging_table.json +8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_table/blocks/sandbag.json +e2fa2e6ba85ec27b3fbb6ad12a731a7ecff1c509 data/superbwarfare/loot_table/blocks/scheelite_ore.json +a223f61202cf9937e8be5b90791925bba09d17b9 data/superbwarfare/loot_table/blocks/silver_block.json +fb31a40f6a04000f317823cbb80eda8588ba9c69 data/superbwarfare/loot_table/blocks/silver_ore.json +83112ebff477e322bd3d23ed4653c7c02b230473 data/superbwarfare/loot_table/blocks/steel_block.json +71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_table/blocks/tungsten_block.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e deleted file mode 100644 index ac8806830..000000000 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ /dev/null @@ -1,4 +0,0 @@ -// 1.20.1 2025-03-11T20:54:56.3941101 Recipes -9775e550332c69f1ee2ac4a09834a35db6f6a2ed data/minecraft/recipes/ammo_box_add_ammo.json -b23d5c199168cf868d89722c62042bfa8852b768 data/minecraft/recipes/ammo_box_extract_ammo.json -2e1d1bbf32801f3d355c0d3f78ebbb1122cebd4c data/minecraft/recipes/potion_mortar_shell.json diff --git a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 index 95860c2cc..c480ad7b9 100644 --- a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 +++ b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 @@ -1,7 +1,7 @@ -// 1.20.1 2025-03-16T14:52:45.530806 Tags for minecraft:block mod id superbwarfare -0acfd31854bf15f2c108138b3df7206bd2593e6b data/minecraft/tags/blocks/mineable/axe.json -8965b7e0b3f7494b78b596ed00b9721b483b0796 data/minecraft/tags/blocks/mineable/pickaxe.json -3da7f021790388a122717f16f51c7ec5232eebcb data/minecraft/tags/blocks/mineable/shovel.json -f42a8c01336e64b74da966f03d45ee0d60ac5d6b data/minecraft/tags/blocks/needs_iron_tool.json -4fd66f3a19e8b9b77c5a2ef30848dec69e26e47b data/superbwarfare/tags/blocks/hard_collision.json -2f52d564d89eb8a125f3dba5d99ec7cb3bc8d7ba data/superbwarfare/tags/blocks/soft_collision.json +// 1.21.1 2025-03-27T19:21:19.6223541 Tags for minecraft:block mod id superbwarfare +0acfd31854bf15f2c108138b3df7206bd2593e6b data/minecraft/tags/block/mineable/axe.json +8965b7e0b3f7494b78b596ed00b9721b483b0796 data/minecraft/tags/block/mineable/pickaxe.json +3da7f021790388a122717f16f51c7ec5232eebcb data/minecraft/tags/block/mineable/shovel.json +f42a8c01336e64b74da966f03d45ee0d60ac5d6b data/minecraft/tags/block/needs_iron_tool.json +fd591943fd73212b7697be1f050450b2af15cac0 data/superbwarfare/tags/block/hard_collision.json +2f52d564d89eb8a125f3dba5d99ec7cb3bc8d7ba data/superbwarfare/tags/block/soft_collision.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 7a9dfe874..4e50491f0 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-21T17:02:34.294309 Item Models: superbwarfare +// 1.21.1 2025-03-27T19:46:28.6502692 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json @@ -21,10 +21,8 @@ a52a7f9dc18d5af69903c2249239c15cb6d38c8e assets/superbwarfare/models/item/coal_p fc892b610a110980dbc6f8e2c080672b5dc06e99 assets/superbwarfare/models/item/copper_plate.json 7e43d8e9c4b8589f7665c46d4b67de645949cc6b assets/superbwarfare/models/item/creative_charging_station.json b0296c3d68f3b5ae4945b46384fa20a1ff32cac5 assets/superbwarfare/models/item/crowbar.json -d81b738e17048945459ff8b59f8f83e872171473 assets/superbwarfare/models/item/defuser.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json 6f4a829dc159f1740f52265d01730ecb6a840d81 assets/superbwarfare/models/item/dog_tag.json -dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone.json 831ce33c5a4c90b71a42515f42f16d4c1a946c50 assets/superbwarfare/models/item/empty_perk.json 2419503d8b597c92684d1921895a12fca33fec69 assets/superbwarfare/models/item/epic_material_pack.json b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing_parameters.json @@ -67,7 +65,6 @@ a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/mle_19 db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar_barrel.json 3922427d3921d3de7195614780ee8f57dfc0ee6f assets/superbwarfare/models/item/mortar_base_plate.json ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json -9baf936f4340d41a0b5581857313240627b00386 assets/superbwarfare/models/item/mortar_deployer.json 41381cc65305bbfc1324a08b580125073d198e11 assets/superbwarfare/models/item/mortar_shell.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json 4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index 3b76ef4a6..b96be85b2 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-24T23:42:51.1511918 Block States: superbwarfare +// 1.21.1 2025-03-27T19:46:28.6444106 Block States: superbwarfare f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json 0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json 472c06e6b43ad09925edaa88e9376bfd27ab267f assets/superbwarfare/blockstates/charging_station.json diff --git a/src/generated/resources/.cache/fccefbc98890e89f31af48c3878f78fdede0afb2 b/src/generated/resources/.cache/fccefbc98890e89f31af48c3878f78fdede0afb2 index 61a492588..c49937ce2 100644 --- a/src/generated/resources/.cache/fccefbc98890e89f31af48c3878f78fdede0afb2 +++ b/src/generated/resources/.cache/fccefbc98890e89f31af48c3878f78fdede0afb2 @@ -1,3 +1,3 @@ -// 1.20.1 2024-12-02T20:47:31.4302884 Tags for minecraft:damage_type mod id superbwarfare -ddb620a872e399a1733001853474cf0b7eb9dc88 data/superbwarfare/tags/damage_type/projectile.json -a14ba1399ece410382dce60dda85902fdd87bf23 data/superbwarfare/tags/damage_type/projectile_absolute.json +// 1.21.1 2025-03-27T19:46:28.6414823 Tags for minecraft:damage_type mod id superbwarfare +af0be8dca0b255f58322d79eff933eb855406f6b data/superbwarfare/tags/damage_type/projectile.json +3f7d47fe61dde5ebb1ecb7f0f2a4804dc1c8478d data/superbwarfare/tags/damage_type/projectile_absolute.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/defuser.json b/src/generated/resources/assets/superbwarfare/models/item/defuser.json deleted file mode 100644 index e50a885f8..000000000 --- a/src/generated/resources/assets/superbwarfare/models/item/defuser.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "superbwarfare:item/defuser" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/drone.json b/src/generated/resources/assets/superbwarfare/models/item/drone.json deleted file mode 100644 index 1a28b4d3f..000000000 --- a/src/generated/resources/assets/superbwarfare/models/item/drone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "superbwarfare:item/drone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json deleted file mode 100644 index 2317598c6..000000000 --- a/src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "superbwarfare:item/mortar_deployer" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/silver.json b/src/generated/resources/data/c/tags/item/ores/silver.json index e69de29bb..1ce3b263a 100644 --- a/src/generated/resources/data/c/tags/item/ores/silver.json +++ b/src/generated/resources/data/c/tags/item/ores/silver.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json rename to src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/generated/resources/data/c/tags/item/ores_in_ground/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json rename to src/generated/resources/data/c/tags/item/ores_in_ground/stone.json diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json new file mode 100644 index 000000000..829b201f9 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/plates.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:plates/copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/copper.json b/src/generated/resources/data/c/tags/item/plates/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/copper.json rename to src/generated/resources/data/c/tags/item/plates/copper.json diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json index e69de29bb..18414d4be 100644 --- a/src/generated/resources/data/c/tags/item/raw_materials.json +++ b/src/generated/resources/data/c/tags/item/raw_materials.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:raw_materials/lead", + "#c:raw_materials/tungsten", + "#c:raw_materials/silver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/lead.json b/src/generated/resources/data/c/tags/item/raw_materials/lead.json index e69de29bb..a4baa13f2 100644 --- a/src/generated/resources/data/c/tags/item/raw_materials/lead.json +++ b/src/generated/resources/data/c/tags/item/raw_materials/lead.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:galena" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials/tungsten.json b/src/generated/resources/data/c/tags/item/raw_materials/tungsten.json index e69de29bb..4614fd5a3 100644 --- a/src/generated/resources/data/c/tags/item/raw_materials/tungsten.json +++ b/src/generated/resources/data/c/tags/item/raw_materials/tungsten.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:scheelite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json deleted file mode 100644 index 1a47202e6..000000000 --- a/src/generated/resources/data/forge/tags/items/dusts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "#forge:dusts/coal_coke", - "#forge:dusts/tungsten" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json b/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json deleted file mode 100644 index 383ee00b8..000000000 --- a/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:coal_powder" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/items/dusts/iron.json deleted file mode 100644 index 47d2213b1..000000000 --- a/src/generated/resources/data/forge/tags/items/dusts/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:iron_powder" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/tungsten.json b/src/generated/resources/data/forge/tags/items/dusts/tungsten.json deleted file mode 100644 index 10d289ef3..000000000 --- a/src/generated/resources/data/forge/tags/items/dusts/tungsten.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:tungsten_powder" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json deleted file mode 100644 index 4ed7a194f..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "#forge:ingots/lead", - "#forge:ingots/steel", - "#forge:ingots/tungsten", - "#forge:ingots/silver" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/lead.json b/src/generated/resources/data/forge/tags/items/ingots/lead.json deleted file mode 100644 index 478dd5d11..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots/lead.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:lead_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/silver.json b/src/generated/resources/data/forge/tags/items/ingots/silver.json deleted file mode 100644 index e0da7f053..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots/silver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:silver_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/steel.json b/src/generated/resources/data/forge/tags/items/ingots/steel.json deleted file mode 100644 index bfc14f6e2..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:steel_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/tungsten.json b/src/generated/resources/data/forge/tags/items/ingots/tungsten.json deleted file mode 100644 index abc438f31..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots/tungsten.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:tungsten_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json deleted file mode 100644 index fc3876ad3..000000000 --- a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "values": [ - "superbwarfare:galena_ore", - "superbwarfare:deepslate_galena_ore", - "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_scheelite_ore", - "superbwarfare:silver_ore", - "superbwarfare:deepslate_silver_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json deleted file mode 100644 index e7e09b8c9..000000000 --- a/src/generated/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "#forge:ores/lead", - "#forge:ores/tungsten", - "#forge:ores/silver" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/lead.json b/src/generated/resources/data/forge/tags/items/ores/lead.json deleted file mode 100644 index b8f2be6ac..000000000 --- a/src/generated/resources/data/forge/tags/items/ores/lead.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "superbwarfare:galena_ore", - "superbwarfare:deepslate_galena_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/silver.json b/src/generated/resources/data/forge/tags/items/ores/silver.json deleted file mode 100644 index 1ce3b263a..000000000 --- a/src/generated/resources/data/forge/tags/items/ores/silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "superbwarfare:silver_ore", - "superbwarfare:deepslate_silver_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/tungsten.json b/src/generated/resources/data/forge/tags/items/ores/tungsten.json deleted file mode 100644 index 205fed423..000000000 --- a/src/generated/resources/data/forge/tags/items/ores/tungsten.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_scheelite_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/items/plates.json deleted file mode 100644 index e00de8919..000000000 --- a/src/generated/resources/data/forge/tags/items/plates.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:plates/copper" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json deleted file mode 100644 index f99c22c73..000000000 --- a/src/generated/resources/data/forge/tags/items/raw_materials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "#forge:raw_materials/lead", - "#forge:raw_materials/tungsten", - "#forge:raw_materials/silver" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/lead.json b/src/generated/resources/data/forge/tags/items/raw_materials/lead.json deleted file mode 100644 index a4baa13f2..000000000 --- a/src/generated/resources/data/forge/tags/items/raw_materials/lead.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:galena" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/silver.json b/src/generated/resources/data/forge/tags/items/raw_materials/silver.json deleted file mode 100644 index 6ae4bdd37..000000000 --- a/src/generated/resources/data/forge/tags/items/raw_materials/silver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:raw_silver" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json b/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json deleted file mode 100644 index 4614fd5a3..000000000 --- a/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:scheelite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index a5f033999..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "#forge:storage_blocks/lead", - "#forge:storage_blocks/steel", - "#forge:storage_blocks/tungsten", - "#forge:storage_blocks/silver" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json deleted file mode 100644 index d9eb998c3..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:lead_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json deleted file mode 100644 index d6c1bef53..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:silver_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json deleted file mode 100644 index 38f856dd3..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:steel_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json b/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json deleted file mode 100644 index ebd65d156..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:tungsten_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/ammo_box_add_ammo.json b/src/generated/resources/data/minecraft/recipes/ammo_box_add_ammo.json deleted file mode 100644 index 951d4afac..000000000 --- a/src/generated/resources/data/minecraft/recipes/ammo_box_add_ammo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "superbwarfare:ammo_box_add_ammo", - "category": "misc" -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/ammo_box_extract_ammo.json b/src/generated/resources/data/minecraft/recipes/ammo_box_extract_ammo.json deleted file mode 100644 index 6cda2aa93..000000000 --- a/src/generated/resources/data/minecraft/recipes/ammo_box_extract_ammo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "superbwarfare:ammo_box_extract_ammo", - "category": "misc" -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/potion_mortar_shell.json b/src/generated/resources/data/minecraft/recipes/potion_mortar_shell.json deleted file mode 100644 index e5ee9b624..000000000 --- a/src/generated/resources/data/minecraft/recipes/potion_mortar_shell.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "superbwarfare:potion_mortar_shell", - "category": "misc" -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index 9b87f3c42..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:barbed_wire" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index 8a71eb356..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "values": [ - "superbwarfare:galena_ore", - "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_galena_ore", - "superbwarfare:deepslate_scheelite_ore", - "superbwarfare:dragon_teeth", - "superbwarfare:reforging_table", - "superbwarfare:lead_block", - "superbwarfare:steel_block", - "superbwarfare:tungsten_block", - "superbwarfare:cemented_carbide_block", - "superbwarfare:silver_ore", - "superbwarfare:deepslate_silver_ore", - "superbwarfare:silver_block", - "superbwarfare:jump_pad", - "superbwarfare:container", - "superbwarfare:charging_station", - "superbwarfare:fumo_25" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json deleted file mode 100644 index 340083688..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "superbwarfare:sandbag" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json deleted file mode 100644 index b01142b0f..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "values": [ - "superbwarfare:galena_ore", - "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_galena_ore", - "superbwarfare:deepslate_scheelite_ore", - "superbwarfare:dragon_teeth", - "superbwarfare:silver_ore", - "superbwarfare:deepslate_silver_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/barbed_wire.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/barbed_wire.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/cemented_carbide_block.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/cemented_carbide_block.json diff --git a/src/generated/resources/data/superbwarfare/loot_table/blocks/charging_station.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/charging_station.json new file mode 100644 index 000000000..ea7a4f3cb --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/charging_station.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "superbwarfare:charging_station" + } + ], + "functions": [ + { + "function": "minecraft:copy_custom_data", + "ops": [ + { + "op": "replace", + "source": "Energy", + "target": "BlockEntityTag.Energy" + }, + { + "op": "replace", + "source": "id", + "target": "BlockEntityTag.id" + } + ], + "source": "block_entity" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/charging_station" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/container.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/container.json similarity index 89% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/container.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/container.json index e98abdf22..b176097cd 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/container.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/container.json @@ -11,12 +11,12 @@ "entries": [ { "type": "minecraft:item", - "name": "superbwarfare:container" + "name": "minecraft:air" } ], "functions": [ { - "function": "minecraft:copy_nbt", + "function": "minecraft:copy_custom_data", "ops": [ { "op": "replace", diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/creative_charging_station.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/creative_charging_station.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/creative_charging_station.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/creative_charging_station.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_galena_ore.json similarity index 77% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_galena_ore.json index 104a226ee..b4a39eaeb 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_galena_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_scheelite_ore.json similarity index 77% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_scheelite_ore.json index 25bc23c6d..4a2814cb4 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_scheelite_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_silver_ore.json similarity index 77% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_silver_ore.json index 04baf6174..54cc9d79b 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/deepslate_silver_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/dragon_teeth.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/dragon_teeth.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/fumo_25.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/fumo_25.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/fumo_25.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/fumo_25.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/galena_ore.json similarity index 76% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/galena_ore.json index ccce9fbcd..f4fe25bb8 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/galena_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/jump_pad.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/jump_pad.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_block.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/lead_block.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_block.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/lead_block.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/reforging_table.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/reforging_table.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/sandbag.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/sandbag.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/sandbag.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/sandbag.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/scheelite_ore.json similarity index 76% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/scheelite_ore.json index 642729bc6..32b1872a6 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/scheelite_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/silver_block.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/silver_block.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/silver_ore.json similarity index 76% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/silver_ore.json index 3ffab5d79..7558db4d4 100644 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json +++ b/src/generated/resources/data/superbwarfare/loot_table/blocks/silver_ore.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_block.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/steel_block.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_block.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/steel_block.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_block.json b/src/generated/resources/data/superbwarfare/loot_table/blocks/tungsten_block.json similarity index 100% rename from src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_block.json rename to src/generated/resources/data/superbwarfare/loot_table/blocks/tungsten_block.json diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/charging_station.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/charging_station.json deleted file mode 100644 index 49612abb7..000000000 --- a/src/generated/resources/data/superbwarfare/loot_tables/blocks/charging_station.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "superbwarfare:charging_station" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "superbwarfare:blocks/charging_station" -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/blocks/hard_collision.json b/src/generated/resources/data/superbwarfare/tags/blocks/hard_collision.json deleted file mode 100644 index c5be52c55..000000000 --- a/src/generated/resources/data/superbwarfare/tags/blocks/hard_collision.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "values": [ - "#minecraft:logs", - "#minecraft:planks", - "#forge:glass", - "#forge:glass_panes", - "#minecraft:wooden_slabs", - "#minecraft:wooden_stairs", - "minecraft:ice", - "minecraft:frosted_ice", - "minecraft:packed_ice", - "minecraft:blue_ice" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/blocks/soft_collision.json b/src/generated/resources/data/superbwarfare/tags/blocks/soft_collision.json deleted file mode 100644 index 29c12762b..000000000 --- a/src/generated/resources/data/superbwarfare/tags/blocks/soft_collision.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "values": [ - "#minecraft:leaves", - "#minecraft:fences", - "#minecraft:fence_gates", - "#minecraft:doors", - "#minecraft:trapdoors", - "#minecraft:walls", - "minecraft:cactus", - "minecraft:bamboo", - "minecraft:melon", - "minecraft:pumpkin", - "minecraft:hay_block", - "minecraft:bell", - "minecraft:chain", - "minecraft:snow_block", - "minecraft:cobweb", - "minecraft:mushroom_stem", - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/damage_type/projectile.json b/src/generated/resources/data/superbwarfare/tags/damage_type/projectile.json index 75e16298f..c54d4a344 100644 --- a/src/generated/resources/data/superbwarfare/tags/damage_type/projectile.json +++ b/src/generated/resources/data/superbwarfare/tags/damage_type/projectile.json @@ -4,34 +4,6 @@ "superbwarfare:gunfire_headshot", "minecraft:arrow", "minecraft:trident", - "minecraft:thrown", - { - "id": "tacz:bullet", - "required": false - }, - { - "id": "tacz:bullet_void", - "required": false - }, - { - "id": "virtuarealcraft:rain_crystal", - "required": false - }, - { - "id": "virtuarealcraft:rain_shower_butterfly", - "required": false - }, - { - "id": "virtuarealcraft:sparkle_butterfly", - "required": false - }, - { - "id": "dreamaticvoyage:blood_crystal", - "required": false - }, - { - "id": "dreamaticvoyage:leviy_beam", - "required": false - } + "minecraft:thrown" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/damage_type/projectile_absolute.json b/src/generated/resources/data/superbwarfare/tags/damage_type/projectile_absolute.json index ac2bd89b1..2899ac866 100644 --- a/src/generated/resources/data/superbwarfare/tags/damage_type/projectile_absolute.json +++ b/src/generated/resources/data/superbwarfare/tags/damage_type/projectile_absolute.json @@ -1,18 +1,6 @@ { "values": [ "superbwarfare:gunfire_absolute", - "superbwarfare:gunfire_headshot_absolute", - { - "id": "tacz:bullet_ignore_armor", - "required": false - }, - { - "id": "tacz:bullet_void_ignore_armor", - "required": false - }, - { - "id": "dreamaticvoyage:leviy_beam_absolute", - "required": false - } + "superbwarfare:gunfire_headshot_absolute" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint.json new file mode 100644 index 000000000..f36965b69 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#superbwarfare:blueprint/common", + "#superbwarfare:blueprint/rare", + "#superbwarfare:blueprint/epic", + "#superbwarfare:blueprint/legendary", + "#superbwarfare:blueprint/cannon" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/cannon.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/cannon.json new file mode 100644 index 000000000..39cf703b7 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/cannon.json @@ -0,0 +1,7 @@ +{ + "values": [ + "superbwarfare:mk_42_blueprint", + "superbwarfare:mle_1934_blueprint", + "superbwarfare:annihilator_blueprint" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/common.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/common.json new file mode 100644 index 000000000..75cd6cfed --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/common.json @@ -0,0 +1,9 @@ +{ + "values": [ + "superbwarfare:glock_17_blueprint", + "superbwarfare:mp_443_blueprint", + "superbwarfare:marlin_blueprint", + "superbwarfare:taser_blueprint", + "superbwarfare:m_1911_blueprint" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/epic.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/epic.json new file mode 100644 index 000000000..013cefdbc --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/epic.json @@ -0,0 +1,18 @@ +{ + "values": [ + "superbwarfare:trachelium_blueprint", + "superbwarfare:hunting_rifle_blueprint", + "superbwarfare:rpg_blueprint", + "superbwarfare:bocek_blueprint", + "superbwarfare:hk_416_blueprint", + "superbwarfare:rpk_blueprint", + "superbwarfare:vector_blueprint", + "superbwarfare:mk_14_blueprint", + "superbwarfare:m_60_blueprint", + "superbwarfare:svd_blueprint", + "superbwarfare:m_98b_blueprint", + "superbwarfare:ak_12_blueprint", + "superbwarfare:devotion_blueprint", + "superbwarfare:qbz_95_blueprint" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json new file mode 100644 index 000000000..5c1581401 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json @@ -0,0 +1,13 @@ +{ + "values": [ + "superbwarfare:aa_12_blueprint", + "superbwarfare:ntw_20_blueprint", + "superbwarfare:minigun_blueprint", + "superbwarfare:sentinel_blueprint", + "superbwarfare:javelin_blueprint", + "superbwarfare:secondary_cataclysm_blueprint", + "superbwarfare:mk_42_blueprint", + "superbwarfare:mle_1934_blueprint", + "superbwarfare:annihilator_blueprint" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/rare.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/rare.json new file mode 100644 index 000000000..4d6e8cd4c --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/rare.json @@ -0,0 +1,13 @@ +{ + "values": [ + "superbwarfare:glock_18_blueprint", + "superbwarfare:m_79_blueprint", + "superbwarfare:m_4_blueprint", + "superbwarfare:sks_blueprint", + "superbwarfare:m_870_blueprint", + "superbwarfare:ak_47_blueprint", + "superbwarfare:k_98_blueprint", + "superbwarfare:mosin_nagant_blueprint", + "superbwarfare:m2hb_blueprint" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/gun.json b/src/generated/resources/data/superbwarfare/tags/item/gun.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/gun.json rename to src/generated/resources/data/superbwarfare/tags/item/gun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/handgun.json b/src/generated/resources/data/superbwarfare/tags/item/handgun.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/handgun.json rename to src/generated/resources/data/superbwarfare/tags/item/handgun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/heavy_weapon.json b/src/generated/resources/data/superbwarfare/tags/item/heavy_weapon.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/heavy_weapon.json rename to src/generated/resources/data/superbwarfare/tags/item/heavy_weapon.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/launcher.json b/src/generated/resources/data/superbwarfare/tags/item/launcher.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/launcher.json rename to src/generated/resources/data/superbwarfare/tags/item/launcher.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/machine_gun.json b/src/generated/resources/data/superbwarfare/tags/item/machine_gun.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/machine_gun.json rename to src/generated/resources/data/superbwarfare/tags/item/machine_gun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/military_armor.json b/src/generated/resources/data/superbwarfare/tags/item/military_armor.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/military_armor.json rename to src/generated/resources/data/superbwarfare/tags/item/military_armor.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json b/src/generated/resources/data/superbwarfare/tags/item/normal_gun.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/normal_gun.json rename to src/generated/resources/data/superbwarfare/tags/item/normal_gun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/revolver.json b/src/generated/resources/data/superbwarfare/tags/item/revolver.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/revolver.json rename to src/generated/resources/data/superbwarfare/tags/item/revolver.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/rifle.json b/src/generated/resources/data/superbwarfare/tags/item/rifle.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/rifle.json rename to src/generated/resources/data/superbwarfare/tags/item/rifle.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/shotgun.json b/src/generated/resources/data/superbwarfare/tags/item/shotgun.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/shotgun.json rename to src/generated/resources/data/superbwarfare/tags/item/shotgun.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/smg.json b/src/generated/resources/data/superbwarfare/tags/item/smg.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/smg.json rename to src/generated/resources/data/superbwarfare/tags/item/smg.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/sniper_rifle.json b/src/generated/resources/data/superbwarfare/tags/item/sniper_rifle.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/sniper_rifle.json rename to src/generated/resources/data/superbwarfare/tags/item/sniper_rifle.json diff --git a/src/generated/resources/data/superbwarfare/tags/item/storage_blocks/steel.json b/src/generated/resources/data/superbwarfare/tags/item/storage_blocks/steel.json index e69de29bb..7db5cec1b 100644 --- a/src/generated/resources/data/superbwarfare/tags/item/storage_blocks/steel.json +++ b/src/generated/resources/data/superbwarfare/tags/item/storage_blocks/steel.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#c:storage_blocks/steel", + { + "id": "dreamaticvoyage:fukamizu_bread_bricks", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_handgun_ammo.json b/src/generated/resources/data/superbwarfare/tags/item/use_handgun_ammo.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/use_handgun_ammo.json rename to src/generated/resources/data/superbwarfare/tags/item/use_handgun_ammo.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_heavy_ammo.json b/src/generated/resources/data/superbwarfare/tags/item/use_heavy_ammo.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/use_heavy_ammo.json rename to src/generated/resources/data/superbwarfare/tags/item/use_heavy_ammo.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_rifle_ammo.json b/src/generated/resources/data/superbwarfare/tags/item/use_rifle_ammo.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/use_rifle_ammo.json rename to src/generated/resources/data/superbwarfare/tags/item/use_rifle_ammo.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json b/src/generated/resources/data/superbwarfare/tags/item/use_shotgun_ammo.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json rename to src/generated/resources/data/superbwarfare/tags/item/use_shotgun_ammo.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_sniper_ammo.json b/src/generated/resources/data/superbwarfare/tags/item/use_sniper_ammo.json similarity index 100% rename from src/generated/resources/data/superbwarfare/tags/items/use_sniper_ammo.json rename to src/generated/resources/data/superbwarfare/tags/item/use_sniper_ammo.json diff --git a/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json b/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json deleted file mode 100644 index 74f9889b7..000000000 --- a/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "superbwarfare:cemented_carbide_ingot", - { - "id": "dreamaticvoyage:hqss_bread_ingot", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/ingots/steel.json b/src/generated/resources/data/superbwarfare/tags/items/ingots/steel.json deleted file mode 100644 index e75e304b2..000000000 --- a/src/generated/resources/data/superbwarfare/tags/items/ingots/steel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "#forge:ingots/steel", - { - "id": "dreamaticvoyage:fukamizu_bread_ingot", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json deleted file mode 100644 index f523d8d4f..000000000 --- a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "superbwarfare:cemented_carbide_block", - { - "id": "dreamaticvoyage:hqss_bread_bricks", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json deleted file mode 100644 index 3e2ba4719..000000000 --- a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "#forge:storage_blocks/steel", - { - "id": "dreamaticvoyage:fukamizu_bread_bricks", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java b/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java index c57162ae7..7138b7fba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java +++ b/src/main/java/com/atsuishio/superbwarfare/component/ModDataComponents.java @@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.component; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.item.common.ammo.box.AmmoBoxInfo; import com.atsuishio.superbwarfare.tools.AmmoType; +import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.core.component.DataComponentType; @@ -12,6 +13,7 @@ import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; +import java.util.List; import java.util.function.UnaryOperator; public class ModDataComponents { @@ -28,6 +30,11 @@ public class ModDataComponents { builder -> builder.persistent(Codec.INT) ); + public static final DeferredHolder, DataComponentType>>> TRANSCRIPT_SCORE = register( + "transcript_score", + builder -> builder.persistent(Codec.pair(Codec.INT, Codec.DOUBLE).listOf()) + ); + public static final DeferredHolder, DataComponentType> AMMO_BOX_INFO = register( "ammo_box_type", builder -> builder.persistent(AmmoBoxInfo.CODEC) diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java b/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java index 95a69024f..0e98b41ba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/DataGenerators.java @@ -21,13 +21,13 @@ public class DataGenerators { CompletableFuture lookupProvider = event.getLookupProvider(); ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); -// generator.addProvider(event.includeServer(), ModLootTableProvider.create(packOutput)); + generator.addProvider(event.includeServer(), ModLootTableProvider.create(packOutput, event.getLookupProvider())); // generator.addProvider(event.includeServer(), new ModRecipeProvider(packOutput)); -// generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); -// generator.addProvider(event.includeServer(), new ModItemModelProvider(packOutput, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModItemModelProvider(packOutput, existingFileHelper)); ModBlockTagProvider tagProvider = generator.addProvider(event.includeServer(), new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper)); generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, tagProvider.contentsGetter(), existingFileHelper)); -// generator.addProvider(event.includeServer(), new ModDamageTypeTagProvider(packOutput, lookupProvider, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModDamageTypeTagProvider(packOutput, lookupProvider, existingFileHelper)); // generator.addProvider(event.includeServer(), new ModAdvancementProvider(packOutput, existingFileHelper)); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java new file mode 100644 index 000000000..4af0e65da --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockLootProvider.java @@ -0,0 +1,80 @@ +package com.atsuishio.superbwarfare.datagen; + +import com.atsuishio.superbwarfare.init.ModBlocks; +import com.atsuishio.superbwarfare.init.ModItems; +import com.mojang.datafixers.util.Pair; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.CopyCustomDataFunction; +import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import org.jetbrains.annotations.NotNull; + +import java.util.List; +import java.util.Set; + +public class ModBlockLootProvider extends BlockLootSubProvider { + + public ModBlockLootProvider(HolderLookup.Provider provider) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), provider); + } + + @Override + protected void generate() { + this.dropSelf(ModBlocks.SANDBAG.get()); + this.dropSelf(ModBlocks.BARBED_WIRE.get()); + this.dropSelf(ModBlocks.JUMP_PAD.get()); + this.dropSelf(ModBlocks.DRAGON_TEETH.get()); + this.dropSelf(ModBlocks.REFORGING_TABLE.get()); + this.dropSelf(ModBlocks.LEAD_BLOCK.get()); + this.dropSelf(ModBlocks.STEEL_BLOCK.get()); + this.dropSelf(ModBlocks.TUNGSTEN_BLOCK.get()); + this.dropSelf(ModBlocks.CEMENTED_CARBIDE_BLOCK.get()); + this.dropSelf(ModBlocks.SILVER_BLOCK.get()); + this.dropSelf(ModBlocks.CREATIVE_CHARGING_STATION.get()); + this.dropSelf(ModBlocks.FUMO_25.get()); + + this.add(ModBlocks.CHARGING_STATION.get(), createCopyNBTDrops(ModBlocks.CHARGING_STATION.get(), + List.of(Pair.of("Energy", "BlockEntityTag.Energy"), + Pair.of("id", "BlockEntityTag.id")))); + + this.add(ModBlocks.GALENA_ORE.get(), this.createOreDrop(ModBlocks.GALENA_ORE.get(), ModItems.GALENA.get())); + this.add(ModBlocks.SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + this.add(ModBlocks.SILVER_ORE.get(), this.createOreDrop(ModBlocks.SILVER_ORE.get(), ModItems.RAW_SILVER.get())); + this.add(ModBlocks.DEEPSLATE_GALENA_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModItems.GALENA.get())); + this.add(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + this.add(ModBlocks.DEEPSLATE_SILVER_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_SILVER_ORE.get(), ModItems.RAW_SILVER.get())); + + this.add(ModBlocks.CONTAINER.get(), LootTable.lootTable().withPool(this.applyExplosionCondition(ModBlocks.CONTAINER.get(), + LootPool.lootPool().setRolls(ConstantValue.exactly(1.0F)).add(LootItem.lootTableItem(ModBlocks.CONTAINER.get())) + .apply(CopyCustomDataFunction.copyData(ContextNbtProvider.BLOCK_ENTITY).copy("Entity", "BlockEntityTag.Entity") + .copy("EntityType", "BlockEntityTag.EntityType"))))); + // TODO small container +// this.add(ModBlocks.SMALL_CONTAINER.get(), LootTable.lootTable().withPool(this.applyExplosionCondition(ModBlocks.SMALL_CONTAINER.get(), +// LootPool.lootPool().setRolls(ConstantValue.exactly(1.0F)).add(LootItem.lootTableItem(ModBlocks.SMALL_CONTAINER.get())) +// .apply(CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY).copy("LootTable", "BlockEntityTag.LootTable") +// .copy("LootTableSeed", "BlockEntityTag.LootTableSeed"))))); + } + + @Override + protected @NotNull Iterable getKnownBlocks() { + return ModBlocks.REGISTRY.getEntries().stream().map(r -> (Block) r.value()).toList(); + } + + public LootTable.Builder createCopyNBTDrops(Block pBlock, List> paths) { + var pool = LootPool.lootPool().setRolls(ConstantValue.exactly(1.0F)).add(LootItem.lootTableItem(pBlock)); + if (!paths.isEmpty()) { + var copy = CopyCustomDataFunction.copyData(ContextNbtProvider.BLOCK_ENTITY); + for (var path : paths) { + copy.copy(path.getFirst(), path.getSecond()); + } + pool.apply(copy); + } + return LootTable.lootTable().withPool(this.applyExplosionCondition(pBlock, pool)); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java new file mode 100644 index 000000000..e1a9a0240 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModBlockStateProvider.java @@ -0,0 +1,63 @@ +package com.atsuishio.superbwarfare.datagen; + +import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.init.ModBlocks; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.client.model.generators.BlockStateProvider; +import net.neoforged.neoforge.client.model.generators.ModelFile; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.registries.DeferredHolder; + +@SuppressWarnings({"ConstantConditions", "SameParameterValue"}) +public class ModBlockStateProvider extends BlockStateProvider { + + public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { + super(output, ModUtils.MODID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() { + horizontalBlock(ModBlocks.BARBED_WIRE.get(), new ModelFile.UncheckedModelFile(modLoc("block/barbed_wire"))); + horizontalBlock(ModBlocks.JUMP_PAD.get(), new ModelFile.UncheckedModelFile(modLoc("block/jump_pad"))); + horizontalBlock(ModBlocks.REFORGING_TABLE.get(), new ModelFile.UncheckedModelFile(modLoc("block/reforging_table"))); + horizontalBlock(ModBlocks.CONTAINER.get(), new ModelFile.UncheckedModelFile(modLoc("block/container"))); + // TODO small container + // horizontalBlock(ModBlocks.SMALL_CONTAINER.get(), new ModelFile.UncheckedModelFile(modLoc("block/small_container"))); + horizontalBlock(ModBlocks.CHARGING_STATION.get(), new ModelFile.UncheckedModelFile(modLoc("block/charging_station"))); + horizontalBlock(ModBlocks.CREATIVE_CHARGING_STATION.get(), new ModelFile.UncheckedModelFile(modLoc("block/creative_charging_station"))); + + blockWithItem(ModBlocks.GALENA_ORE); + blockWithItem(ModBlocks.DEEPSLATE_GALENA_ORE); + blockWithItem(ModBlocks.SCHEELITE_ORE); + blockWithItem(ModBlocks.DEEPSLATE_SCHEELITE_ORE); + blockWithItem(ModBlocks.LEAD_BLOCK); + blockWithItem(ModBlocks.STEEL_BLOCK); + blockWithItem(ModBlocks.TUNGSTEN_BLOCK); + blockWithItem(ModBlocks.CEMENTED_CARBIDE_BLOCK); + blockWithItem(ModBlocks.SILVER_ORE); + blockWithItem(ModBlocks.DEEPSLATE_SILVER_ORE); + blockWithItem(ModBlocks.SILVER_BLOCK); + + simpleBlock(ModBlocks.FUMO_25.get(), new ModelFile.UncheckedModelFile(modLoc("block/fumo_25"))); + } + + private String name(Block block) { + return key(block).getPath(); + } + + private ResourceLocation key(Block block) { + return BuiltInRegistries.BLOCK.getKey(block); + } + + private void blockItem(DeferredHolder blockRegistryObject) { + simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(ModUtils.MODID + + ":block/" + BuiltInRegistries.BLOCK.getKey(blockRegistryObject.get()).getPath())); + } + + private void blockWithItem(DeferredHolder blockRegistryObject) { + simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get())); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java new file mode 100644 index 000000000..eed5b1572 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java @@ -0,0 +1,39 @@ +package com.atsuishio.superbwarfare.datagen; + +import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.init.ModDamageTypes; +import com.atsuishio.superbwarfare.init.ModTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.DamageTypeTagsProvider; +import net.minecraft.world.damagesource.DamageTypes; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class ModDamageTypeTagProvider extends DamageTypeTagsProvider { + + public ModDamageTypeTagProvider(PackOutput pOutput, CompletableFuture pLookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(pOutput, pLookupProvider, ModUtils.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.@NotNull Provider pProvider) { + this.tag(ModTags.DamageTypes.PROJECTILE).add(ModDamageTypes.GUN_FIRE, ModDamageTypes.GUN_FIRE_HEADSHOT, + DamageTypes.ARROW, DamageTypes.TRIDENT, DamageTypes.THROWN); +// .addOptional(new ResourceLocation("tacz", "bullet")) +// .addOptional(new ResourceLocation("tacz", "bullet_void")) +// .addOptional(new ResourceLocation("virtuarealcraft", "rain_crystal")) +// .addOptional(new ResourceLocation("virtuarealcraft", "rain_shower_butterfly")) +// .addOptional(new ResourceLocation("virtuarealcraft", "sparkle_butterfly")) +// .addOptional(new ResourceLocation("dreamaticvoyage", "blood_crystal")) +// .addOptional(new ResourceLocation("dreamaticvoyage", "leviy_beam")); + this.tag(ModTags.DamageTypes.PROJECTILE_ABSOLUTE).add(ModDamageTypes.GUN_FIRE_ABSOLUTE, ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE); +// .addOptional(new ResourceLocation("tacz", "bullet_ignore_armor")) +// .addOptional(new ResourceLocation("tacz", "bullet_void_ignore_armor")) +// .addOptional(new ResourceLocation("dreamaticvoyage", "leviy_beam_absolute")); + } + +} diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java new file mode 100644 index 000000000..df1a254eb --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -0,0 +1,200 @@ +package com.atsuishio.superbwarfare.datagen; + +import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.init.ModBlocks; +import com.atsuishio.superbwarfare.init.ModItems; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; +import net.neoforged.neoforge.client.model.generators.ItemModelProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.registries.DeferredHolder; + +@SuppressWarnings({"ConstantConditions", "UnusedReturnValue", "SameParameterValue", "unused"}) +public class ModItemModelProvider extends ItemModelProvider { + public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { + super(output, ModUtils.MODID, existingFileHelper); + } + + @Override + protected void registerModels() { + simpleItem(ModItems.EMPTY_PERK, "perk/"); + + simpleItem(ModItems.MORTAR_SHELL); + + // misc + simpleItem(ModItems.ANCIENT_CPU); + simpleItem(ModItems.PROPELLER); + simpleItem(ModItems.LARGE_PROPELLER); + simpleItem(ModItems.MOTOR); + simpleItem(ModItems.LARGE_MOTOR); + simpleItem(ModItems.WHEEL); + simpleItem(ModItems.TRACK); + // TODO drone +// simpleItem(ModItems.DRONE); + simpleItem(ModItems.LIGHT_ARMAMENT_MODULE); + simpleItem(ModItems.MEDIUM_ARMAMENT_MODULE); + simpleItem(ModItems.HEAVY_ARMAMENT_MODULE); + + simpleItem(ModItems.TARGET_DEPLOYER); + // TODO mortar +// simpleItem(ModItems.MORTAR_DEPLOYER); + simpleItem(ModItems.MORTAR_BARREL); + simpleItem(ModItems.MORTAR_BASE_PLATE); + simpleItem(ModItems.MORTAR_BIPOD); + simpleItem(ModItems.SEEKER); + simpleItem(ModItems.MISSILE_ENGINE); + simpleItem(ModItems.FUSEE); + simpleItem(ModItems.PRIMER); + simpleItem(ModItems.AP_HEAD); + simpleItem(ModItems.HE_HEAD); + simpleItem(ModItems.CANNON_CORE); + simpleItem(ModItems.COPPER_PLATE); + simpleItem(ModItems.STEEL_INGOT); + simpleItem(ModItems.LEAD_INGOT); + simpleItem(ModItems.TUNGSTEN_INGOT); + simpleItem(ModItems.CEMENTED_CARBIDE_INGOT); + simpleItem(ModItems.HIGH_ENERGY_EXPLOSIVES); + simpleItem(ModItems.GRAIN); + simpleItem(ModItems.IRON_POWDER); + simpleItem(ModItems.TUNGSTEN_POWDER); + simpleItem(ModItems.COAL_POWDER); + simpleItem(ModItems.COAL_IRON_POWDER); + simpleItem(ModItems.RAW_CEMENTED_CARBIDE_POWDER); + simpleItem(ModItems.GALENA); + simpleItem(ModItems.SCHEELITE); + simpleItem(ModItems.DOG_TAG); + simpleItem(ModItems.TRANSCRIPT); + simpleItem(ModItems.RAW_SILVER); + simpleItem(ModItems.SILVER_INGOT); + handheldItem(ModItems.CROWBAR); + // TODO defuser +// handheldItem(ModItems.DEFUSER); + simpleItem(ModItems.FIRING_PARAMETERS); + simpleItem(ModItems.BEAM_TEST); + simpleItem(ModItems.HANDGUN_AMMO); + simpleItem(ModItems.RIFLE_AMMO); + simpleItem(ModItems.SNIPER_AMMO); + simpleItem(ModItems.SHOTGUN_AMMO); + simpleItem(ModItems.HEAVY_AMMO); + simpleItem(ModItems.ROCKET_70); + simpleItem(ModItems.WIRE_GUIDE_MISSILE); + simpleItem(ModItems.SMALL_SHELL); + simpleItem(ModItems.SMALL_BATTERY_PACK); + simpleItem(ModItems.MEDIUM_BATTERY_PACK); + simpleItem(ModItems.LARGE_BATTERY_PACK); + + simpleItem(ModItems.TUNGSTEN_ROD); + simpleItem(ModItems.IRON_BARREL); + simpleItem(ModItems.IRON_ACTION); + simpleItem(ModItems.IRON_TRIGGER); + simpleItem(ModItems.IRON_SPRING); + simpleItem(ModItems.STEEL_BARREL); + simpleItem(ModItems.STEEL_ACTION); + simpleItem(ModItems.STEEL_TRIGGER); + simpleItem(ModItems.STEEL_SPRING); + simpleItem(ModItems.CEMENTED_CARBIDE_BARREL); + simpleItem(ModItems.CEMENTED_CARBIDE_ACTION); + simpleItem(ModItems.CEMENTED_CARBIDE_TRIGGER); + simpleItem(ModItems.CEMENTED_CARBIDE_SPRING); + simpleItem(ModItems.NETHERITE_BARREL); + simpleItem(ModItems.NETHERITE_ACTION); + simpleItem(ModItems.NETHERITE_TRIGGER); + simpleItem(ModItems.NETHERITE_SPRING); + + simpleItem(ModItems.COMMON_MATERIAL_PACK); + simpleItem(ModItems.RARE_MATERIAL_PACK); + simpleItem(ModItems.EPIC_MATERIAL_PACK); + simpleItem(ModItems.LEGENDARY_MATERIAL_PACK); + + // armor + simpleItem(ModItems.RU_HELMET_6B47); + simpleItem(ModItems.RU_CHEST_6B43); + simpleItem(ModItems.US_HELMET_PASTG); + simpleItem(ModItems.US_CHEST_IOTV); + simpleItem(ModItems.GE_HELMET_M_35); + + // blueprints + gunBlueprintItem(ModItems.TRACHELIUM_BLUEPRINT); + gunBlueprintItem(ModItems.GLOCK_17_BLUEPRINT); + gunBlueprintItem(ModItems.GLOCK_18_BLUEPRINT); + gunBlueprintItem(ModItems.MP_443_BLUEPRINT); + gunBlueprintItem(ModItems.HUNTING_RIFLE_BLUEPRINT); + gunBlueprintItem(ModItems.M_79_BLUEPRINT); + gunBlueprintItem(ModItems.RPG_BLUEPRINT); + gunBlueprintItem(ModItems.BOCEK_BLUEPRINT); + gunBlueprintItem(ModItems.M_4_BLUEPRINT); + gunBlueprintItem(ModItems.AA_12_BLUEPRINT); + gunBlueprintItem(ModItems.HK_416_BLUEPRINT); + gunBlueprintItem(ModItems.RPK_BLUEPRINT); + gunBlueprintItem(ModItems.SKS_BLUEPRINT); + gunBlueprintItem(ModItems.NTW_20_BLUEPRINT); + gunBlueprintItem(ModItems.VECTOR_BLUEPRINT); + gunBlueprintItem(ModItems.MINIGUN_BLUEPRINT); + gunBlueprintItem(ModItems.MK_14_BLUEPRINT); + gunBlueprintItem(ModItems.SENTINEL_BLUEPRINT); + gunBlueprintItem(ModItems.M_60_BLUEPRINT); + gunBlueprintItem(ModItems.SVD_BLUEPRINT); + gunBlueprintItem(ModItems.MARLIN_BLUEPRINT); + gunBlueprintItem(ModItems.M_870_BLUEPRINT); + gunBlueprintItem(ModItems.M_98B_BLUEPRINT); + gunBlueprintItem(ModItems.AK_12_BLUEPRINT); + gunBlueprintItem(ModItems.AK_47_BLUEPRINT); + gunBlueprintItem(ModItems.DEVOTION_BLUEPRINT); + gunBlueprintItem(ModItems.TASER_BLUEPRINT); + gunBlueprintItem(ModItems.M_1911_BLUEPRINT); + gunBlueprintItem(ModItems.QBZ_95_BLUEPRINT); + gunBlueprintItem(ModItems.K_98_BLUEPRINT); + gunBlueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); + gunBlueprintItem(ModItems.JAVELIN_BLUEPRINT); + cannonBlueprintItem(ModItems.MK_42_BLUEPRINT); + cannonBlueprintItem(ModItems.MLE_1934_BLUEPRINT); + cannonBlueprintItem(ModItems.ANNIHILATOR_BLUEPRINT); + gunBlueprintItem(ModItems.M_2_HB_BLUEPRINT); + gunBlueprintItem(ModItems.SECONDARY_CATACLYSM_BLUEPRINT); + + // blocks + evenSimplerBlockItem(ModBlocks.BARBED_WIRE); + evenSimplerBlockItem(ModBlocks.JUMP_PAD); + evenSimplerBlockItem(ModBlocks.REFORGING_TABLE); + evenSimplerBlockItem(ModBlocks.CHARGING_STATION); + evenSimplerBlockItem(ModBlocks.CREATIVE_CHARGING_STATION); + } + + private ItemModelBuilder simpleItem(DeferredHolder item) { + return simpleItem(item, ""); + } + + private ItemModelBuilder simpleItem(DeferredHolder item, String location) { + return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) + .texture("layer0", ModUtils.loc("item/" + location + item.getId().getPath())); + } + + private ItemModelBuilder simpleItem(DeferredHolder item, String location, String renderType) { + return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) + .texture("layer0", ModUtils.loc("item/" + location + item.getId().getPath())).renderType(renderType); + } + + public void evenSimplerBlockItem(DeferredHolder block) { + this.withExistingParent(ModUtils.MODID + ":" + BuiltInRegistries.BLOCK.getKey(block.get()).getPath(), + modLoc("block/" + BuiltInRegistries.BLOCK.getKey(block.get()).getPath())); + } + + private ItemModelBuilder gunBlueprintItem(DeferredHolder item) { + return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) + .texture("layer0", ModUtils.loc("item/gun_blueprint")); + } + + private ItemModelBuilder cannonBlueprintItem(DeferredHolder item) { + return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/generated")) + .texture("layer0", ModUtils.loc("item/cannon_blueprint")); + } + + private ItemModelBuilder handheldItem(DeferredHolder item) { + return withExistingParent(item.getId().getPath(), ResourceLocation.withDefaultNamespace("item/handheld")) + .texture("layer0", ModUtils.loc("item/" + item.getId().getPath())); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index e8ffba843..0293c6892 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -79,49 +79,46 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.SMG).add(ModItems.VECTOR.get()); -// this.tag(ModTags.Items.HANDGUN).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.MP_443.get()); + this.tag(ModTags.Items.HANDGUN).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.MP_443.get()); -// this.tag(ModTags.Items.RIFLE).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), -// ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.RIFLE).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), + ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get()); -// this.tag(ModTags.Items.SNIPER_RIFLE).add(ModItems.HUNTING_RIFLE.get(), ModItems.SENTINEL.get(), -// ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.SNIPER_RIFLE).add(ModItems.HUNTING_RIFLE.get(), ModItems.SENTINEL.get(), + ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); -// this.tag(ModTags.Items.HEAVY_WEAPON).add(ModItems.NTW_20.get()); + this.tag(ModTags.Items.HEAVY_WEAPON).add(ModItems.NTW_20.get()); -// this.tag(ModTags.Items.SHOTGUN).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.SHOTGUN).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); -// this.tag(ModTags.Items.MACHINE_GUN).add(ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.RPK.get(), ModItems.M_60.get()); + this.tag(ModTags.Items.MACHINE_GUN).add(ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.RPK.get(), ModItems.M_60.get()); this.tag(ModTags.Items.NORMAL_GUN).add( -// ModItems.HOMEMADE_SHOTGUN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), - ModItems.VECTOR.get() -// ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.TRACHELIUM.get(), -// ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.M_870.get(), ModItems.MARLIN.get(), ModItems.GLOCK_17.get(), -// ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get(), ModItems.MP_443.get() + ModItems.HOMEMADE_SHOTGUN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), + ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.TRACHELIUM.get(), + ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.M_870.get(), ModItems.MARLIN.get(), ModItems.GLOCK_17.get(), + ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get(), ModItems.MP_443.get() ); this.tag(ModTags.Items.USE_HANDGUN_AMMO).add( -// ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), - ModItems.VECTOR.get() -// ModItems.MP_443.get() + ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.VECTOR.get(), ModItems.MP_443.get() ); -// this.tag(ModTags.Items.USE_RIFLE_AMMO).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.M_60.get(), -// ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get(), ModItems.RPK.get(), ModItems.TRACHELIUM.get()); + this.tag(ModTags.Items.USE_RIFLE_AMMO).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.M_60.get(), + ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.AK_12.get(), ModItems.QBZ_95.get(), ModItems.RPK.get(), ModItems.TRACHELIUM.get()); -// this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.HOMEMADE_SHOTGUN.get(), ModItems.M_870.get(), ModItems.AA_12.get()); -// this.tag(ModTags.Items.USE_SNIPER_AMMO).add(ModItems.HUNTING_RIFLE.get(), ModItems.SENTINEL.get(), -// ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.USE_SNIPER_AMMO).add(ModItems.HUNTING_RIFLE.get(), ModItems.SENTINEL.get(), + ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); -// this.tag(ModTags.Items.USE_HEAVY_AMMO).add(ModItems.NTW_20.get()); + this.tag(ModTags.Items.USE_HEAVY_AMMO).add(ModItems.NTW_20.get()); -// this.tag(ModTags.Items.LAUNCHER).add(ModItems.M_79.get(), ModItems.RPG.get(), ModItems.JAVELIN.get(), ModItems.SECONDARY_CATACLYSM.get()); + this.tag(ModTags.Items.LAUNCHER).add(ModItems.M_79.get(), ModItems.RPG.get(), ModItems.JAVELIN.get(), ModItems.SECONDARY_CATACLYSM.get()); -// this.tag(ModTags.Items.REVOLVER).add(ModItems.TRACHELIUM.get()); + this.tag(ModTags.Items.REVOLVER).add(ModItems.TRACHELIUM.get()); -// this.tag(ModTags.Items.MILITARY_ARMOR).add(ModItems.RU_CHEST_6B43.get(), ModItems.US_CHEST_IOTV.get()); + this.tag(ModTags.Items.MILITARY_ARMOR).add(ModItems.RU_CHEST_6B43.get(), ModItems.US_CHEST_IOTV.get()); this.tag(ModTags.Items.BLUEPRINT).addTags(ModTags.Items.COMMON_BLUEPRINT, ModTags.Items.RARE_BLUEPRINT, ModTags.Items.EPIC_BLUEPRINT, ModTags.Items.LEGENDARY_BLUEPRINT, ModTags.Items.CANNON_BLUEPRINT); @@ -134,10 +131,10 @@ public class ModItemTagProvider extends ItemTagsProvider { ModItems.BOCEK_BLUEPRINT.get(), ModItems.HK_416_BLUEPRINT.get(), ModItems.RPK_BLUEPRINT.get(), ModItems.VECTOR_BLUEPRINT.get(), ModItems.MK_14_BLUEPRINT.get(), ModItems.M_60_BLUEPRINT.get(), ModItems.SVD_BLUEPRINT.get(), ModItems.M_98B_BLUEPRINT.get(), ModItems.AK_12_BLUEPRINT.get(), ModItems.DEVOTION_BLUEPRINT.get(), ModItems.QBZ_95_BLUEPRINT.get()); -// this.tag(ModTags.Items.LEGENDARY_BLUEPRINT).add(ModItems.AA_12_BLUEPRINT.get(), ModItems.NTW_20_BLUEPRINT.get(), ModItems.MINIGUN_BLUEPRINT.get(), -// ModItems.SENTINEL_BLUEPRINT.get(), ModItems.JAVELIN_BLUEPRINT.get(), ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), ModItems.MK_42_BLUEPRINT.get(), -// ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get()); -// this.tag(ModTags.Items.CANNON_BLUEPRINT).add(ModItems.MK_42_BLUEPRINT.get(), ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get()); + this.tag(ModTags.Items.LEGENDARY_BLUEPRINT).add(ModItems.AA_12_BLUEPRINT.get(), ModItems.NTW_20_BLUEPRINT.get(), ModItems.MINIGUN_BLUEPRINT.get(), + ModItems.SENTINEL_BLUEPRINT.get(), ModItems.JAVELIN_BLUEPRINT.get(), ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), ModItems.MK_42_BLUEPRINT.get(), + ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get()); + this.tag(ModTags.Items.CANNON_BLUEPRINT).add(ModItems.MK_42_BLUEPRINT.get(), ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get()); } public static TagKey cTag(String name) { diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModLootTableProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModLootTableProvider.java new file mode 100644 index 000000000..fb8c673fe --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModLootTableProvider.java @@ -0,0 +1,18 @@ +package com.atsuishio.superbwarfare.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public class ModLootTableProvider { + public static LootTableProvider create(PackOutput output, CompletableFuture registries) { + return new LootTableProvider(output, Set.of(), List.of( + new LootTableProvider.SubProviderEntry(ModBlockLootProvider::new, LootContextParamSets.BLOCK) + ), registries); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java index 220241598..1777b72bf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.block.BarbedWireBlock; +import com.atsuishio.superbwarfare.component.ModDataComponents; import com.atsuishio.superbwarfare.config.server.MiscConfig; import com.atsuishio.superbwarfare.config.server.ProjectileConfig; import com.atsuishio.superbwarfare.entity.ICustomKnockback; @@ -10,6 +11,7 @@ import com.atsuishio.superbwarfare.network.message.ClientIndicatorMessage; import com.atsuishio.superbwarfare.network.message.ClientMotionSyncMessage; import com.atsuishio.superbwarfare.network.message.PlayerGunKillMessage; import com.atsuishio.superbwarfare.tools.*; +import com.mojang.datafixers.util.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; @@ -57,9 +59,7 @@ import software.bernie.geckolib.animation.AnimatableManager; import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; +import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; @@ -428,31 +428,21 @@ public class ProjectileEntity extends Projectile implements IEntityWithComplexSp ItemStack stack = player.getOffhandItem(); - // TODO transcript -// if (stack.is(ModItems.TRANSCRIPT.get())) { -// final int size = 10; -// -// ListTag tags = NBTTool.getOrCreateTag(stack).getList(Transcript.TAG_SCORES, Tag.TAG_COMPOUND); -// -// Queue queue = new ArrayDeque<>(); -// for (int i = 0; i < tags.size(); i++) { -// queue.add(tags.getCompound(i)); -// } -// -// CompoundTag tag = new CompoundTag(); -// tag.putInt("Score", score); -// tag.putDouble("Distance", distance); -// queue.offer(tag); -// -// while (queue.size() > size) { -// queue.poll(); -// } -// -// ListTag newTags = new ListTag(); -// newTags.addAll(queue); -// -// NBTTool.getOrCreateTag(stack).put(Transcript.TAG_SCORES, newTags); -// } + if (stack.is(ModItems.TRANSCRIPT.get())) { + final int size = 10; + + var scores = stack.get(ModDataComponents.TRANSCRIPT_SCORE); + if (scores == null) scores = List.of(); + + Queue> queue = new ArrayDeque<>(scores); + queue.offer(new Pair<>(score, distance)); + + while (queue.size() > size) { + queue.poll(); + } + + stack.set(ModDataComponents.TRANSCRIPT_SCORE, List.copyOf(queue)); + } } protected void onHitBlock(Vec3 location) { diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java index 9a0ae9f9b..2626fc4ba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModBlocks.java @@ -44,6 +44,8 @@ public class ModBlocks { public static final DeferredHolder CEMENTED_CARBIDE_BLOCK = REGISTRY.register("cemented_carbide_block", () -> new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops())); public static final DeferredHolder CONTAINER = REGISTRY.register("container", ContainerBlock::new); + // TODO small container +// public static final DeferredHolder SMALL_CONTAINER = REGISTRY.register("small_container", SmallContainerBlock::new); public static final DeferredHolder CHARGING_STATION = REGISTRY.register("charging_station", ChargingStationBlock::new); public static final DeferredHolder CREATIVE_CHARGING_STATION = REGISTRY.register("creative_charging_station", () -> new CreativeChargingStationBlock()); public static final DeferredHolder FUMO_25 = REGISTRY.register("fumo_25", FuMO25Block::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 93d934b75..218578b3b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -135,18 +135,18 @@ public class ModItems { // // public static final DeferredHolder DETONATOR = ITEMS.register("detonator", Detonator::new); public static final DeferredHolder TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::new); - // public static final DeferredHolder KNIFE = ITEMS.register("knife", Knife::new); -// public static final DeferredHolder HAMMER = ITEMS.register("hammer", Hammer::new); + public static final DeferredHolder KNIFE = ITEMS.register("knife", Knife::new); + public static final DeferredHolder HAMMER = ITEMS.register("hammer", Hammer::new); public static final DeferredHolder CROWBAR = ITEMS.register("crowbar", Crowbar::new); // public static final DeferredHolder DEFUSER = ITEMS.register("defuser", Defuser::new); public static final DeferredHolder ARMOR_PLATE = ITEMS.register("armor_plate", ArmorPlate::new); -// -public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register("ru_helmet_6b47", RuHelmet6b47::new); + + public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register("ru_helmet_6b47", RuHelmet6b47::new); public static final DeferredHolder RU_CHEST_6B43 = ITEMS.register("ru_chest_6b43", RuChest6b43::new); public static final DeferredHolder US_HELMET_PASTG = ITEMS.register("us_helmet_pastg", UsHelmetPastg::new); public static final DeferredHolder US_CHEST_IOTV = ITEMS.register("us_chest_iotv", UsChestIotv::new); public static final DeferredHolder GE_HELMET_M_35 = ITEMS.register("ge_helmet_m_35", GeHelmetM35::new); -// public static final DeferredHolder MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); + // public static final DeferredHolder MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); public static final DeferredHolder MORTAR_BARREL = ITEMS.register("mortar_barrel", () -> new Item(new Item.Properties())); public static final DeferredHolder MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", () -> new Item(new Item.Properties())); public static final DeferredHolder MORTAR_BIPOD = ITEMS.register("mortar_bipod", () -> new Item(new Item.Properties())); @@ -173,13 +173,13 @@ public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register(" public static final DeferredHolder GALENA = ITEMS.register("galena", () -> new Item(new Item.Properties())); public static final DeferredHolder SCHEELITE = ITEMS.register("scheelite", () -> new Item(new Item.Properties())); public static final DeferredHolder RAW_SILVER = ITEMS.register("raw_silver", () -> new Item(new Item.Properties())); - // public static final DeferredHolder DOG_TAG = ITEMS.register("dog_tag", DogTag::new); + public static final DeferredHolder DOG_TAG = ITEMS.register("dog_tag", DogTag::new); public static final DeferredHolder CELL = ITEMS.register("cell", () -> new BatteryItem(24000, new Item.Properties())); public static final DeferredHolder BATTERY = ITEMS.register("battery", () -> new BatteryItem(100000, new Item.Properties())); public static final DeferredHolder SMALL_BATTERY_PACK = ITEMS.register("small_battery_pack", () -> new BatteryItem(500000, new Item.Properties())); public static final DeferredHolder MEDIUM_BATTERY_PACK = ITEMS.register("medium_battery_pack", () -> new BatteryItem(5000000, new Item.Properties())); public static final DeferredHolder LARGE_BATTERY_PACK = ITEMS.register("large_battery_pack", () -> new BatteryItem(20000000, new Item.Properties())); - // public static final DeferredHolder TRANSCRIPT = ITEMS.register("transcript", Transcript::new); + public static final DeferredHolder TRANSCRIPT = ITEMS.register("transcript", Transcript::new); public static final DeferredHolder FIRING_PARAMETERS = ITEMS.register("firing_parameters", FiringParameters::new); public static final DeferredHolder TUNGSTEN_ROD = ITEMS.register("tungsten_rod", () -> new Item(new Item.Properties())); @@ -195,15 +195,15 @@ public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register(" public static final DeferredHolder CEMENTED_CARBIDE_ACTION = ITEMS.register("cemented_carbide_action", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); public static final DeferredHolder CEMENTED_CARBIDE_TRIGGER = ITEMS.register("cemented_carbide_trigger", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); public static final DeferredHolder CEMENTED_CARBIDE_SPRING = ITEMS.register("cemented_carbide_spring", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); -// public static final DeferredHolder NETHERITE_BARREL = ITEMS.register("netherite_barrel", () -> new Item(new Item.Properties().rarity(RarityTool.LEGENDARY))); -// public static final DeferredHolder NETHERITE_ACTION = ITEMS.register("netherite_action", () -> new Item(new Item.Properties().rarity(RarityTool.LEGENDARY))); -// public static final DeferredHolder NETHERITE_TRIGGER = ITEMS.register("netherite_trigger", () -> new Item(new Item.Properties().rarity(RarityTool.LEGENDARY))); -// public static final DeferredHolder NETHERITE_SPRING = ITEMS.register("netherite_spring", () -> new Item(new Item.Properties().rarity(RarityTool.LEGENDARY))); + public static final DeferredHolder NETHERITE_BARREL = ITEMS.register("netherite_barrel", () -> new Item(new Item.Properties().rarity(ModRarity.getLegendary()))); + public static final DeferredHolder NETHERITE_ACTION = ITEMS.register("netherite_action", () -> new Item(new Item.Properties().rarity(ModRarity.getLegendary()))); + public static final DeferredHolder NETHERITE_TRIGGER = ITEMS.register("netherite_trigger", () -> new Item(new Item.Properties().rarity(ModRarity.getLegendary()))); + public static final DeferredHolder NETHERITE_SPRING = ITEMS.register("netherite_spring", () -> new Item(new Item.Properties().rarity(ModRarity.getLegendary()))); public static final DeferredHolder COMMON_MATERIAL_PACK = ITEMS.register("common_material_pack", () -> new MaterialPack(Rarity.COMMON)); public static final DeferredHolder RARE_MATERIAL_PACK = ITEMS.register("rare_material_pack", () -> new MaterialPack(Rarity.RARE)); public static final DeferredHolder EPIC_MATERIAL_PACK = ITEMS.register("epic_material_pack", () -> new MaterialPack(Rarity.EPIC)); -// public static final DeferredHolder LEGENDARY_MATERIAL_PACK = ITEMS.register("legendary_material_pack", () -> new MaterialPack(RarityTool.LEGENDARY)); + public static final DeferredHolder LEGENDARY_MATERIAL_PACK = ITEMS.register("legendary_material_pack", () -> new MaterialPack(ModRarity.getLegendary())); public static final DeferredHolder TRACHELIUM_BLUEPRINT = ITEMS.register("trachelium_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder GLOCK_17_BLUEPRINT = ITEMS.register("glock_17_blueprint", () -> new BlueprintItem(Rarity.COMMON)); @@ -214,15 +214,15 @@ public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register(" public static final DeferredHolder RPG_BLUEPRINT = ITEMS.register("rpg_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder BOCEK_BLUEPRINT = ITEMS.register("bocek_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder M_4_BLUEPRINT = ITEMS.register("m_4_blueprint", () -> new BlueprintItem(Rarity.RARE)); - // public static final DeferredHolder AA_12_BLUEPRINT = ITEMS.register("aa_12_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder AA_12_BLUEPRINT = ITEMS.register("aa_12_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder HK_416_BLUEPRINT = ITEMS.register("hk_416_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder RPK_BLUEPRINT = ITEMS.register("rpk_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder SKS_BLUEPRINT = ITEMS.register("sks_blueprint", () -> new BlueprintItem(Rarity.RARE)); - // public static final DeferredHolder NTW_20_BLUEPRINT = ITEMS.register("ntw_20_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder NTW_20_BLUEPRINT = ITEMS.register("ntw_20_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder VECTOR_BLUEPRINT = ITEMS.register("vector_blueprint", () -> new BlueprintItem(Rarity.EPIC)); - // public static final DeferredHolder MINIGUN_BLUEPRINT = ITEMS.register("minigun_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder MINIGUN_BLUEPRINT = ITEMS.register("minigun_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder MK_14_BLUEPRINT = ITEMS.register("mk_14_blueprint", () -> new BlueprintItem(Rarity.EPIC)); - // public static final DeferredHolder SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder M_60_BLUEPRINT = ITEMS.register("m_60_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder SVD_BLUEPRINT = ITEMS.register("svd_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder MARLIN_BLUEPRINT = ITEMS.register("marlin_blueprint", () -> new BlueprintItem(Rarity.COMMON)); @@ -236,16 +236,16 @@ public static final DeferredHolder RU_HELMET_6B47 = ITEMS.register(" public static final DeferredHolder QBZ_95_BLUEPRINT = ITEMS.register("qbz_95_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder K_98_BLUEPRINT = ITEMS.register("k_98_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder MOSIN_NAGANT_BLUEPRINT = ITEMS.register("mosin_nagant_blueprint", () -> new BlueprintItem(Rarity.RARE)); - // public static final DeferredHolder JAVELIN_BLUEPRINT = ITEMS.register("javelin_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder JAVELIN_BLUEPRINT = ITEMS.register("javelin_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder M_2_HB_BLUEPRINT = ITEMS.register("m2hb_blueprint", () -> new BlueprintItem(Rarity.RARE)); -// public static final DeferredHolder SECONDARY_CATACLYSM_BLUEPRINT = ITEMS.register("secondary_cataclysm_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); -// public static final DeferredHolder MK_42_BLUEPRINT = ITEMS.register("mk_42_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); -// public static final DeferredHolder MLE_1934_BLUEPRINT = ITEMS.register("mle_1934_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); -// public static final DeferredHolder ANNIHILATOR_BLUEPRINT = ITEMS.register("annihilator_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final DeferredHolder SECONDARY_CATACLYSM_BLUEPRINT = ITEMS.register("secondary_cataclysm_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); + public static final DeferredHolder MK_42_BLUEPRINT = ITEMS.register("mk_42_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); + public static final DeferredHolder MLE_1934_BLUEPRINT = ITEMS.register("mle_1934_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); + public static final DeferredHolder ANNIHILATOR_BLUEPRINT = ITEMS.register("annihilator_blueprint", () -> new BlueprintItem(ModRarity.getLegendary())); public static final DeferredHolder LIGHT_ARMAMENT_MODULE = ITEMS.register("light_armament_module", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); public static final DeferredHolder MEDIUM_ARMAMENT_MODULE = ITEMS.register("medium_armament_module", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); -// public static final DeferredHolder HEAVY_ARMAMENT_MODULE = ITEMS.register("heavy_armament_module", () -> new Item(new Item.Properties().rarity(RarityTool.LEGENDARY))); + public static final DeferredHolder HEAVY_ARMAMENT_MODULE = ITEMS.register("heavy_armament_module", () -> new Item(new Item.Properties().rarity(ModRarity.getLegendary()))); /** * Block diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModRarity.java b/src/main/java/com/atsuishio/superbwarfare/init/ModRarity.java new file mode 100644 index 000000000..984658f9f --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModRarity.java @@ -0,0 +1,18 @@ +package com.atsuishio.superbwarfare.init; + +import net.minecraft.ChatFormatting; +import net.minecraft.world.item.Rarity; +import net.neoforged.fml.common.asm.enumextension.EnumProxy; + +public class ModRarity { + public static final EnumProxy SUPERBWARFARE_LEGENDARY = new EnumProxy<>( + Rarity.class, + -1, + "superbwarfare:legendary", + ChatFormatting.GOLD + ); + + public static Rarity getLegendary() { + return SUPERBWARFARE_LEGENDARY.getValue(); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java new file mode 100644 index 000000000..f46905be2 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java @@ -0,0 +1,25 @@ +package com.atsuishio.superbwarfare.item; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.SlotContext; +import top.theillusivec4.curios.api.type.capability.ICurioItem; + +import java.util.concurrent.atomic.AtomicBoolean; + +public class DogTag extends Item implements ICurioItem { + public DogTag() { + super(new Properties().stacksTo(1)); + } + + @Override + public boolean canEquip(SlotContext slotContext, ItemStack stack) { + LivingEntity livingEntity = slotContext.entity(); + AtomicBoolean flag = new AtomicBoolean(true); + CuriosApi.getCuriosInventory(livingEntity).flatMap(c -> c.findFirstCurio(this)).ifPresent(s -> flag.set(false)); + + return flag.get(); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Hammer.java b/src/main/java/com/atsuishio/superbwarfare/item/Hammer.java new file mode 100644 index 000000000..d5d2c3612 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/Hammer.java @@ -0,0 +1,91 @@ +package com.atsuishio.superbwarfare.item; + +import com.atsuishio.superbwarfare.init.ModItems; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import org.jetbrains.annotations.NotNull; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.GAME) +public class Hammer extends SwordItem { + + public Hammer() { + super(new Tier() { + public int getUses() { + return 400; + } + + public float getSpeed() { + return 4f; + } + + public float getAttackDamageBonus() { + return 8f; + } + + @Override + public @NotNull TagKey getIncorrectBlocksForDrops() { + return BlockTags.INCORRECT_FOR_IRON_TOOL; + } + + public int getLevel() { + return 1; + } + + public int getEnchantmentValue() { + return 9; + } + + public @NotNull Ingredient getRepairIngredient() { + return Ingredient.of(new ItemStack(Items.IRON_INGOT)); + } + }, new Properties()); + } + + @Override + public boolean hasCraftingRemainingItem(@NotNull ItemStack stack) { + return true; + } + + @Override + public @NotNull ItemStack getCraftingRemainingItem(ItemStack itemstack) { + ItemStack stack = new ItemStack(this); + stack.setDamageValue(itemstack.getDamageValue() + 1); + if (stack.getDamageValue() >= stack.getMaxDamage()) { + return ItemStack.EMPTY; + } + return stack; + } + + @Override + public boolean isRepairable(@NotNull ItemStack itemstack) { + return true; + } + + @SubscribeEvent + public static void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { + var item = event.getCrafting(); + var container = event.getInventory(); + var player = event.getEntity(); + + if (player.level().isClientSide) return; + + if (item.is(ModItems.HAMMER.get())) { + int count = 0; + for (int i = 0; i < container.getContainerSize(); i++) { + if (container.getItem(i).is(ModItems.HAMMER.get())) count++; + } + if (count == 2) { + container.clearContent(); + } + } + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Knife.java b/src/main/java/com/atsuishio/superbwarfare/item/Knife.java new file mode 100644 index 000000000..64757de4c --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/Knife.java @@ -0,0 +1,46 @@ +package com.atsuishio.superbwarfare.item; + +import com.atsuishio.superbwarfare.init.ModItems; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import org.jetbrains.annotations.NotNull; + +public class Knife extends SwordItem { + public Knife() { + super(new Tier() { + public int getUses() { + return 1500; + } + + public float getSpeed() { + return 7f; + } + + public float getAttackDamageBonus() { + return 2.5f; + } + + @Override + public @NotNull TagKey getIncorrectBlocksForDrops() { + return BlockTags.INCORRECT_FOR_IRON_TOOL; + } + + public int getLevel() { + return 2; + } + + public int getEnchantmentValue() { + return 2; + } + + public @NotNull Ingredient getRepairIngredient() { + return Ingredient.of(new ItemStack(ModItems.STEEL_INGOT.get())); + } + }, new Properties()); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java b/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java new file mode 100644 index 000000000..964290a3e --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/Transcript.java @@ -0,0 +1,60 @@ +package com.atsuishio.superbwarfare.item; + +import com.atsuishio.superbwarfare.component.ModDataComponents; +import com.atsuishio.superbwarfare.tools.FormatTool; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; + +public class Transcript extends Item { + + public Transcript() { + super(new Properties().stacksTo(1)); + } + + @Override + @ParametersAreNonnullByDefault + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("des.superbwarfare.transcript").withStyle(ChatFormatting.GRAY)); + addScoresText(stack, tooltipComponents); + } + + public void addScoresText(ItemStack stack, List tooltip) { + var scores = stack.get(ModDataComponents.TRANSCRIPT_SCORE); + if (scores == null) scores = List.of(); + + int total = 0; + for (var info : scores) { + int score = info.getFirst(); + total += score; + tooltip.add(Component.translatable("des.superbwarfare.transcript.score").withStyle(ChatFormatting.GRAY) + .append(Component.literal(score + " ").withStyle(score == 10 ? ChatFormatting.GOLD : ChatFormatting.WHITE)) + .append(Component.translatable("des.superbwarfare.transcript.distance").withStyle(ChatFormatting.GRAY)) + .append(Component.literal(FormatTool.format1D(info.getSecond(), "m")).withStyle(ChatFormatting.WHITE))); + } + + tooltip.add(Component.translatable("des.superbwarfare.transcript.total").withStyle(ChatFormatting.YELLOW) + .append(Component.literal(total + " ").withStyle(total == 100 ? ChatFormatting.GOLD : ChatFormatting.WHITE))); + } + + @Override + @ParametersAreNonnullByDefault + public @NotNull InteractionResultHolder use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) { + if (pPlayer.isCrouching()) { + ItemStack stack = pPlayer.getItemInHand(pUsedHand); + stack.set(ModDataComponents.TRANSCRIPT_SCORE, List.of()); + return InteractionResultHolder.success(stack); + } + return super.use(pLevel, pPlayer, pUsedHand); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java index b6ad00369..5989401de 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java @@ -36,7 +36,7 @@ public class Ntw20Item extends GunItem implements GeoItem { public Ntw20Item() { super(new Properties().stacksTo(1) // TODO rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java index f85a8d066..15ad0c53d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java @@ -53,7 +53,7 @@ public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon { public JavelinItem() { super(new Properties().stacksTo(1) // TODO rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 592da06b1..ddbd48d60 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -44,7 +44,7 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, SpecialFireW public SecondaryCataclysm() { super(new Properties().stacksTo(1).fireResistant() // TODO rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java index 5f1a06bf9..3e6c845ea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java @@ -43,7 +43,7 @@ public class MinigunItem extends GunItem implements GeoItem { public MinigunItem() { super(new Properties().stacksTo(1) // TODO rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java index 4437d5ba1..04c1665ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -38,7 +38,7 @@ public class Aa12Item extends GunItem implements GeoItem { public Aa12Item() { super(new Properties().stacksTo(1) // TODO rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index 86977fb7d..ea17fc385 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -44,7 +44,7 @@ public class SentinelItem extends GunItem implements GeoItem { public SentinelItem() { super(new Properties().stacksTo(1) // todo rarity -// .rarity(RarityTool.LEGENDARY) +// .rarity(ModRarity.getLegendary()) ); this.energyCapacity = () -> 24000; diff --git a/src/main/templates/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg similarity index 100% rename from src/main/templates/META-INF/accesstransformer.cfg rename to src/main/resources/META-INF/accesstransformer.cfg diff --git a/src/main/resources/META-INF/enumextensions.json b/src/main/resources/META-INF/enumextensions.json new file mode 100644 index 000000000..f79c6f26c --- /dev/null +++ b/src/main/resources/META-INF/enumextensions.json @@ -0,0 +1,13 @@ +{ + "entries": [ + { + "enum": "net/minecraft/world/item/Rarity", + "name": "SUPERBWARFARE_LEGENDARY", + "constructor": "(ILjava/lang/String;Lnet/minecraft/ChatFormatting;)V", + "parameters": { + "class": "com/atsuishio/superbwarfare/init/ModRarity", + "field": "SUPERBWARFARE_LEGENDARY" + } + } + ] +} \ No newline at end of file diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 67c840281..07b6e5405 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -9,6 +9,7 @@ displayName = "Superb Warfare" authors = "${mod_authors}" logoFile = "../../resources/logo.png" description = "${mod_description}" +enumExtensions = "META-INF/enumextensions.json" [[dependencies.superbwarfare]] modId = "neoforge" #mandatory