diff --git a/gradle.properties b/gradle.properties index 0a4b234..b93fb0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3 loader_version=0.16.5 # Mod Properties -mod_version=1.0.0 +mod_version=1.1.0 maven_group=com.kayhennig.vanplusplus archives_base_name=vanilla-plus-plus diff --git a/src/client/java/com/kayhennig/vanplusplus/DynamiteEntityRenderer.java b/src/client/java/com/kayhennig/vanplusplus/DynamiteEntityRenderer.java new file mode 100644 index 0000000..ca0bbff --- /dev/null +++ b/src/client/java/com/kayhennig/vanplusplus/DynamiteEntityRenderer.java @@ -0,0 +1,52 @@ +package com.kayhennig.vanplusplus; + +import com.kayhennig.vanplusplus.thrown.DynamiteEntity; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.EntityRenderer; +import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RotationAxis; + +@Environment(EnvType.CLIENT) +public class DynamiteEntityRenderer extends EntityRenderer { + private final ItemRenderer itemRenderer; + + public DynamiteEntityRenderer(EntityRendererFactory.Context context) { + super(context); + this.itemRenderer = context.getItemRenderer(); + } + + public void render(DynamiteEntity dynamiteEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) { + matrixStack.push(); + matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(MathHelper.lerp(g, dynamiteEntity.prevYaw, dynamiteEntity.getYaw()) + 90F)); + matrixStack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(MathHelper.lerp(g, dynamiteEntity.prevPitch, dynamiteEntity.getPitch()) + 90F)); + matrixStack.translate(0.0D, 0.2D, 0.0D); + + this.itemRenderer.renderItem( + dynamiteEntity.getStack(), + ModelTransformationMode.GROUND, + i, + OverlayTexture.DEFAULT_UV, + matrixStack, + vertexConsumerProvider, + dynamiteEntity.getWorld(), + dynamiteEntity.getId() + ); + matrixStack.pop(); + super.render(dynamiteEntity, f, g, matrixStack, vertexConsumerProvider, i); + } + + @Override + public Identifier getTexture(DynamiteEntity entity) { + return Identifier.of(Vanillaplusplus.MOD_ID, "textures/item/dynamite.png"); + } + +} diff --git a/src/client/java/com/kayhennig/vanplusplus/VanillaplusplusClient.java b/src/client/java/com/kayhennig/vanplusplus/VanillaplusplusClient.java index f322e41..fb662bb 100644 --- a/src/client/java/com/kayhennig/vanplusplus/VanillaplusplusClient.java +++ b/src/client/java/com/kayhennig/vanplusplus/VanillaplusplusClient.java @@ -1,11 +1,13 @@ package com.kayhennig.vanplusplus; import com.kayhennig.vanplusplus.entity.ModBlockEntityType; +import com.kayhennig.vanplusplus.entity.ModEntityType; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; @@ -34,5 +36,6 @@ public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.RED_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLACK_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent()); BlockEntityRendererFactories.register(ModBlockEntityType.SHELF, ShelfBlockEntityRenderer::new); + EntityRendererRegistry.register(ModEntityType.DYNAMITE, DynamiteEntityRenderer::new); } } \ No newline at end of file diff --git a/src/main/generated/.cache/5ee0bcff0625fa81235b2c670158b490b66f9b28 b/src/main/generated/.cache/5ee0bcff0625fa81235b2c670158b490b66f9b28 index faa242f..5ef5e33 100644 --- a/src/main/generated/.cache/5ee0bcff0625fa81235b2c670158b490b66f9b28 +++ b/src/main/generated/.cache/5ee0bcff0625fa81235b2c670158b490b66f9b28 @@ -1,8 +1,8 @@ -// 1.21.1 2024-11-23T19:09:57.7614373 vanilla-plus-plus/Tags for minecraft:block -787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\wall_post_override.json +// 1.21.1 2024-11-25T18:13:00.3800394 vanilla-plus-plus/Tags for minecraft:block 3abe2b0d7c8d68efd16d964a22b0bf2fad5f5f15 data\minecraft\tags\block\mineable\pickaxe.json -f495264194aac7257e23e208f04e54972c768a68 data\vanilla-plus-plus\tags\block\glass_slabs.json +787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\wall_post_override.json c55a5e50dbf14137e77a2351b3aca677d305a85b data\minecraft\tags\block\slabs.json +f495264194aac7257e23e208f04e54972c768a68 data\vanilla-plus-plus\tags\block\glass_slabs.json 4378ce7a43ef36879513f084115ea14710a3e54e data\vanilla-plus-plus\tags\block\vertical_slabs.json 787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\pressure_plates.json f495264194aac7257e23e208f04e54972c768a68 data\minecraft\tags\block\impermeable.json diff --git a/src/main/generated/.cache/9bd4a9bdee5ab2c9172e6973ccab54b40f92e2c4 b/src/main/generated/.cache/9bd4a9bdee5ab2c9172e6973ccab54b40f92e2c4 index 2da6e83..6be9585 100644 --- a/src/main/generated/.cache/9bd4a9bdee5ab2c9172e6973ccab54b40f92e2c4 +++ b/src/main/generated/.cache/9bd4a9bdee5ab2c9172e6973ccab54b40f92e2c4 @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-23T19:09:57.7774786 vanilla-plus-plus/Block Loot Tables +// 1.21.1 2024-11-25T18:13:00.3947194 vanilla-plus-plus/Block Loot Tables 1d31caebd7e2b3c522b3c3f12b2f835b0da48d03 data\vanilla-plus-plus\loot_table\blocks\crimson_shelf.json 579a65b40ddb6291e293e7891f14a47a47beee75 data\vanilla-plus-plus\loot_table\blocks\stripped_spruce_log_slab.json 9c455301b6698e045b6f0a2d36d702790ec749cf data\vanilla-plus-plus\loot_table\blocks\birch_log_slab.json @@ -96,8 +96,8 @@ c45aad54f82942bfd55fed9eb4f385a22a378813 data\vanilla-plus-plus\loot_table\block f6af7c9893874dd507920bb9960ca8f6abd1b01c data\vanilla-plus-plus\loot_table\blocks\mossy_stone_brick_vertical_slab.json 135d3625e7693c09480033b571622230f90b1ba0 data\vanilla-plus-plus\loot_table\blocks\tuff_brick_vertical_slab.json 74d8fd8ba8420892268d7da9ecf7df4242f1fac4 data\vanilla-plus-plus\loot_table\blocks\stripped_oak_log_slab.json -744987525d94151f3ac591d8b06312e7cbebcc63 data\vanilla-plus-plus\loot_table\blocks\warped_stem_slab.json ff95f1c5a753f5fb15e2799359067a048207a2bd data\vanilla-plus-plus\loot_table\blocks\mangrove_log_vertical_slab.json +744987525d94151f3ac591d8b06312e7cbebcc63 data\vanilla-plus-plus\loot_table\blocks\warped_stem_slab.json b3d4d5978293cb6ba1c1c856e01c74935b61d781 data\vanilla-plus-plus\loot_table\blocks\spruce_log_vertical_slab.json de4c12d6a4a0f6b38bacf1d326dd3fde08b0cfce data\vanilla-plus-plus\loot_table\blocks\nether_brick_pressure_plate.json 589b3a54e673f282826129734b3a9eec2a9532d0 data\vanilla-plus-plus\loot_table\blocks\cobblestone_vertical_slab.json diff --git a/src/main/generated/.cache/b653b9fbef8f48ca998cd814a18975637fddf199 b/src/main/generated/.cache/b653b9fbef8f48ca998cd814a18975637fddf199 index e8d7940..22ed37b 100644 --- a/src/main/generated/.cache/b653b9fbef8f48ca998cd814a18975637fddf199 +++ b/src/main/generated/.cache/b653b9fbef8f48ca998cd814a18975637fddf199 @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-23T19:09:57.7789804 vanilla-plus-plus/Recipes +// 1.21.1 2024-11-25T18:13:00.3957179 vanilla-plus-plus/Recipes 62b92549bcfaf63be0b6aca1204af5a94ec32b14 data\vanilla-plus-plus\recipe\stripped_dark_oak_log_vertical_slab.json b9424786c061259ecf2ffedf34f74f3a85c8500a data\vanilla-plus-plus\recipe\oak_log_slab.json abfb165dbe7b6aee1a9994f7648c300c482fc4dd data\vanilla-plus-plus\recipe\polished_andesite_vertical_slab.json @@ -24,7 +24,9 @@ c4d5782f8ae87493f666913bc8ebd5b090e6926a data\vanilla-plus-plus\advancement\reci 7dd1f299fc8986f5f7c7a4d17aedfdd6deeef574 data\vanilla-plus-plus\advancement\recipes\building_blocks\cherry_planks_vertical_slab.json 9a741f71961f63eab3dfb7fc503fde53d924bc5b data\vanilla-plus-plus\recipe\jungle_planks_vertical_slab.json fb33d022a2acaf188c8862bc45baaa5db3862f7a data\vanilla-plus-plus\advancement\recipes\building_blocks\stripped_dark_oak_log_vertical_slab.json +70d1a9eaefe24a50d1f01e8306718b10c868eca1 data\vanilla-plus-plus\recipe\wooden_dagger.json 153d862099db61fb127697acc6434907d4135ca9 data\vanilla-plus-plus\advancement\recipes\building_blocks\blue_stained_glass_horizontal_pane.json +7ba09559754358b479421aa0bb94cf52dd3264e2 data\vanilla-plus-plus\advancement\recipes\tools\iron_hammer.json a9506bb380835357a2ce3aa3add43120febd2508 data\vanilla-plus-plus\recipe\gold_vertical_slab.json 8aa2291c30fe661f2a447e86bde979eef2820cb5 data\vanilla-plus-plus\recipe\red_stained_glass_horizontal_pane.json 1e79ba873ee2dfdc4ebf0325196d8a72bf1bad92 data\vanilla-plus-plus\advancement\recipes\building_blocks\deepslate_brick_vertical_slab.json @@ -34,6 +36,7 @@ a9506bb380835357a2ce3aa3add43120febd2508 data\vanilla-plus-plus\recipe\gold_vert 744a6416252dee83a941124f8a5c7f5ab29a1ddf data\vanilla-plus-plus\advancement\recipes\building_blocks\iron_vertical_slab.json 3ae756d8f8afe3f18c2cc52cbf97f2eaeca9e1ae data\vanilla-plus-plus\recipe\gray_stained_glass_horizontal_pane.json c9de43f4707113ffb28f838191359ecabca5194b data\vanilla-plus-plus\recipe\birch_shelf.json +ce0b4cc91b0db449545fc185eb3c6aa622b0a8c9 data\vanilla-plus-plus\advancement\recipes\tools\netherite_hammer_smithing.json ea6d9a05da98d5e5b8377d73e61c14c788b43839 data\vanilla-plus-plus\advancement\recipes\building_blocks\gold_vertical_slab.json 52326ea35e1abe98bbb915e36d46022171b816a5 data\vanilla-plus-plus\recipe\mangrove_log_vertical_slab.json ae7b2319be3c4eba95fd2ce84c1f93e8b29ca22b data\vanilla-plus-plus\recipe\prismarine_vertical_slab.json @@ -54,6 +57,7 @@ f2036a0519ad7509f7726647a7e1a8f3012e4da6 data\vanilla-plus-plus\advancement\reci 7b468d321c8ddbdd01411daf16f29929a6c51591 data\vanilla-plus-plus\recipe\sandstone_pressure_plate.json 6123670a8c9f43053b95c8a1552870426341193f data\vanilla-plus-plus\recipe\magenta_stained_glass_horizontal_pane.json 598f6e56ca083089d1aa3eca505c237e6214074d data\vanilla-plus-plus\recipe\green_stained_glass_horizontal_pane.json +4f68227ec38656530ed923890bb1551633dae9ec data\vanilla-plus-plus\recipe\golden_hammer.json c1693f13f739ad57f7223326cc1abe3c2a4430b9 data\vanilla-plus-plus\advancement\recipes\building_blocks\granite_vertical_slab.json d9b61969ec314db796275dcdafed6e88a33f9020 data\vanilla-plus-plus\advancement\recipes\building_blocks\red_sandstone_pressure_plate.json c8eb572ea88cbd2e4eee9bfe1ab30bfc4751ef2a data\vanilla-plus-plus\recipe\glass_vertical_slab.json @@ -69,6 +73,7 @@ c64f46a1f653d70463eb914ee065690f22972db3 data\vanilla-plus-plus\advancement\reci 12ee47711ae452a7be6ce7f5d2079c07044a5a2f data\vanilla-plus-plus\advancement\recipes\building_blocks\smooth_stone_pressure_plate.json f1014fd6a5af3b2f315cf663ef65a0c1a6f319c6 data\vanilla-plus-plus\recipe\waxed_exposed_cut_copper_vertical_slab.json 7c6b77a08fb72827fcab2a3763065d0045c54cdf data\vanilla-plus-plus\advancement\recipes\building_blocks\green_stained_glass_horizontal_pane.json +c2e60b918fdfffa09d3c380fc5677b8aa0b68d97 data\vanilla-plus-plus\recipe\netherite_hammer_smithing.json 2f64e1ca8ccd614abeb33723732b812a9c1a39cb data\vanilla-plus-plus\recipe\stripped_oak_log_slab.json 526baa7c5d92e2f26808923a6c4b6814305291da data\vanilla-plus-plus\recipe\waxed_cut_copper_vertical_slab.json e2bda162c244d9eb4d9ce2b12d59bd7a0b3f8a9c data\vanilla-plus-plus\recipe\emerald_slab.json @@ -84,6 +89,7 @@ e2bda162c244d9eb4d9ce2b12d59bd7a0b3f8a9c data\vanilla-plus-plus\recipe\emerald_s 770ff66d76e5472c2f20ea4f77b5db60276f5106 data\vanilla-plus-plus\advancement\recipes\building_blocks\birch_log_vertical_slab.json cf0a321ee5c3421c2712a0ff1cc093ab0c721db7 data\vanilla-plus-plus\recipe\blue_stained_glass_horizontal_pane.json ca9d5f075ceed43e2a652bb2dae4a6aebb446a0b data\vanilla-plus-plus\recipe\crimson_shelf.json +f3c625f17039815ef82e610ce8e216cd41e0043a data\vanilla-plus-plus\advancement\recipes\combat\golden_dagger.json 478bc57469b79bdebd59dc8da4e048929719050e data\vanilla-plus-plus\advancement\recipes\building_blocks\cobblestone_vertical_slab.json e2ddebe0f19042bc898e88c888e4b04983e990b1 data\vanilla-plus-plus\advancement\recipes\building_blocks\cherry_log_vertical_slab.json e67722d828633c0d56f7f067fe2e11dab2184d82 data\vanilla-plus-plus\advancement\recipes\building_blocks\lime_stained_glass_horizontal_pane.json @@ -94,6 +100,7 @@ f920d7bc56c0a657d4992a7ebc0e538e8ef9258a data\vanilla-plus-plus\recipe\stripped_ bd7fdc56802204c94b8dffcbf30266ed82f2aedf data\vanilla-plus-plus\recipe\spruce_log_vertical_slab.json f5092777564c6f32626ff0c43778feb3012b725f data\vanilla-plus-plus\recipe\tuff_vertical_slab.json 9a9740d514abce705a06813658533e19d9892613 data\vanilla-plus-plus\recipe\mangrove_planks_vertical_slab.json +3cd2b6f4ce0576859acf8cb3b2000878fc8f154b data\vanilla-plus-plus\recipe\golden_dagger.json 175b4617a7b0a96c6c72334f54fa31a929a51025 data\vanilla-plus-plus\advancement\recipes\building_blocks\birch_planks_vertical_slab.json 769254ff5a4d699d43475ec5c16c3eb36da70da3 data\vanilla-plus-plus\advancement\recipes\building_blocks\mangrove_log_slab.json 3f1d1496330912475fd08aa5515e6ff36aa0ea09 data\vanilla-plus-plus\recipe\glass_slab.json @@ -108,6 +115,7 @@ c1c1116951d6d10f8c969c23984c6fd9da9e8384 data\vanilla-plus-plus\advancement\reci 26d1c0f55ad3428ee157a23961a2524584887650 data\vanilla-plus-plus\advancement\recipes\building_blocks\bamboo_mosaic_vertical_slab.json cdf2ccf47fb03fe3d9fe8839de2153ba1d8c42f5 data\vanilla-plus-plus\recipe\andesite_vertical_slab.json 44f581f86283185826c33d65c5d7a42dcb9f4ab0 data\vanilla-plus-plus\recipe\red_nether_brick_vertical_slab.json +8c7119408d09cbf8c8eac95f9606158d6502b58c data\vanilla-plus-plus\advancement\recipes\tools\wooden_hammer.json f6373a097a6084840c135ad70edb367808951d11 data\vanilla-plus-plus\advancement\recipes\building_blocks\end_stone_brick_vertical_slab.json 830fb3c6e84d3cbcedaaa2f9ea8aa5a026d95fbb data\vanilla-plus-plus\advancement\recipes\building_blocks\dark_oak_planks_vertical_slab.json 45ed67c47417cab6d87853bb161ed91a961f0647 data\vanilla-plus-plus\recipe\stone_brick_vertical_slab.json @@ -125,6 +133,7 @@ a7c821e65c46988dd94f90680649b117cdcbb324 data\vanilla-plus-plus\advancement\reci f5421900fd675f809e0ac7ef0df47c017575a628 data\vanilla-plus-plus\advancement\recipes\building_blocks\oak_planks_vertical_slab.json 99a865b80aa55f2cde9617050d250a1cc06ff859 data\vanilla-plus-plus\advancement\recipes\building_blocks\mud_brick_vertical_slab.json 7535e8bc7a203c3d0028f1414d35512b3e8761ba data\vanilla-plus-plus\recipe\stripped_birch_log_slab.json +a82be715c06416109b587da35a525b52f817aa3b data\vanilla-plus-plus\recipe\wooden_hammer.json b335d55598585d0b84f6522963f1bd27b263a43c data\vanilla-plus-plus\advancement\recipes\building_blocks\dark_oak_log_vertical_slab.json 8834255dcd348a30b80d9ae2ef57c81bd1665d65 data\vanilla-plus-plus\advancement\recipes\building_blocks\diorite_vertical_slab.json 26db8078adac47e4d5e929130d9b221ad585405f data\vanilla-plus-plus\recipe\mossy_stone_brick_pressure_plate.json @@ -169,7 +178,9 @@ e695e37f8c62133d96cec7277eb840a7d2269545 data\vanilla-plus-plus\advancement\reci 30f3f07b662080ce1e289ed3c6ea8566254e3af6 data\vanilla-plus-plus\advancement\recipes\building_blocks\red_sandstone_vertical_slab.json 572977cfaaa5e73b0128fd5861eb7c4661fcd558 data\vanilla-plus-plus\recipe\dark_oak_planks_vertical_slab.json 9fcfc9c0e1c46fb90f103fc561b7fb7af979439a data\vanilla-plus-plus\advancement\recipes\building_blocks\red_nether_brick_pressure_plate.json +9e37c370b2be937114f0d6c8d285b46ffa3edb6e data\vanilla-plus-plus\recipe\stone_hammer.json 07c97eb6ad57aaebadf8d7b1941c0c4299346a94 data\vanilla-plus-plus\advancement\recipes\building_blocks\cut_red_sandstone_vertical_slab.json +319ff384740a608d2967c2393ce09beb6458e728 data\vanilla-plus-plus\recipe\netherite_dagger_smithing.json 065385002dea63f8f58a50af52be6cd7c74b7203 data\vanilla-plus-plus\advancement\recipes\building_blocks\birch_log_slab.json 3c152b08730b0dac53aa50b6d607c32addfefdf3 data\vanilla-plus-plus\recipe\smooth_stone_vertical_slab.json 50e7a4663fcccfa13ef154e619ed464e95139965 data\vanilla-plus-plus\advancement\recipes\building_blocks\dark_oak_shelf.json @@ -178,12 +189,14 @@ c0343756e2644641c66bc1fde2b736ec1eff6438 data\vanilla-plus-plus\recipe\iron_slab 7d97e1268d6606c3d7eb7c12f80a443a536a1801 data\vanilla-plus-plus\advancement\recipes\building_blocks\polished_deepslate_vertical_slab.json 72008b73c0d2e343d2d1ffb2a2d11870e8f9f992 data\vanilla-plus-plus\advancement\recipes\building_blocks\oak_log_slab.json 2e2fc45df29218b046f0df481463bd7063d3e3df data\vanilla-plus-plus\advancement\recipes\building_blocks\waxed_oxidized_cut_copper_vertical_slab.json +b6301462a33ac6cd90fa7b02fcf4d6dc0d636def data\vanilla-plus-plus\recipe\iron_hammer.json c110bed7edc99615a659e35f0018a623c232438b data\vanilla-plus-plus\recipe\cherry_log_vertical_slab.json 1c8ee5834c3b2bce033ebb9b2646bcd2fc5c6b30 data\vanilla-plus-plus\advancement\recipes\building_blocks\magenta_stained_glass_horizontal_pane.json 843094f7fabe9d75fa44615c617fa28c4c1ad760 data\vanilla-plus-plus\advancement\recipes\building_blocks\red_stained_glass_horizontal_pane.json 3ea12d560e5b98ef4240e19aa7b450d76dfe2f7b data\vanilla-plus-plus\recipe\nether_brick_vertical_slab.json c2dc32174dd28380a746511bff54176c116110c3 data\vanilla-plus-plus\advancement\recipes\building_blocks\deepslate_brick_pressure_plate.json d2e4353abe875b228b1ff32695dbfaa6ef1843ad data\vanilla-plus-plus\advancement\recipes\building_blocks\deepslate_tile_vertical_slab.json +759a7086f942cfabfe7ef74ed062e0dfaf0c3c2d data\vanilla-plus-plus\advancement\recipes\combat\netherite_dagger_smithing.json e1e2e58d48ee42fa97492483f34b4ae987dbdf28 data\vanilla-plus-plus\recipe\birch_log_slab.json ab0ee3f1c9092c293673a929f27c9720f2d0fc1b data\vanilla-plus-plus\recipe\exposed_cut_copper_vertical_slab.json 10090f933fa021427f6409d2ae201baaff29b248 data\vanilla-plus-plus\recipe\stripped_oak_log_vertical_slab.json @@ -202,11 +215,14 @@ a268b30d909cef3e4a928834a7c171f49c955505 data\vanilla-plus-plus\recipe\polished_ 489c695c140bd084d6d921e7bcc4954af9a12abb data\vanilla-plus-plus\recipe\red_nether_brick_pressure_plate.json 3ced505ce1a84a8017078e8e01f171f23558dd5e data\vanilla-plus-plus\recipe\diamond_vertical_slab.json d175f2587c9d445fd2823e313fb48e5d8b60da77 data\vanilla-plus-plus\recipe\yellow_stained_glass_horizontal_pane.json +097488fdbb043cbe61f4e4737dd44276497a5a4e data\vanilla-plus-plus\recipe\diamond_dagger.json 8681563543e9868bc0ebc03887fb9d228726ed85 data\vanilla-plus-plus\recipe\stripped_birch_log_vertical_slab.json +c9a12a86b8e521090522dc007ff7dbf591d08e61 data\vanilla-plus-plus\advancement\recipes\tools\stone_hammer.json 60d1046fe3cbe28ff802c39cc2943fd688a345d4 data\vanilla-plus-plus\recipe\waxed_weathered_cut_copper_vertical_slab.json 79eff03b5d27ff68bd7028c78edaa132791ba153 data\vanilla-plus-plus\advancement\recipes\building_blocks\spruce_log_vertical_slab.json 6b993795d664d8aebd5d8dd1c82a258183d8fca7 data\vanilla-plus-plus\advancement\recipes\building_blocks\crimson_stem_slab.json 35b6a8b156c340dc003ffbcf018d07ac0213d495 data\vanilla-plus-plus\recipe\lime_stained_glass_horizontal_pane.json +f249937568a5d473ec175d25e98c7546c80d9f95 data\vanilla-plus-plus\recipe\stone_dagger.json a48b745c1d9f637d8e41bbb33da3fbe671e54115 data\vanilla-plus-plus\advancement\recipes\building_blocks\stripped_jungle_log_slab.json 8638f88562e4bbace3cb27253db465cbc0e8ad89 data\vanilla-plus-plus\recipe\cobblestone_vertical_slab.json 98452d5df88e1a5b7095548fb9fcd140c08979ba data\vanilla-plus-plus\recipe\red_sandstone_vertical_slab.json @@ -222,14 +238,18 @@ c95b90d23872a49e746edd071654103408767c71 data\vanilla-plus-plus\recipe\polished_ 45196ffd9c55875b8e554ed7889ab69aa56097be data\vanilla-plus-plus\recipe\pink_stained_glass_horizontal_pane.json 00f03823c931a3a159fc5e0610dd726018fa6afe data\vanilla-plus-plus\advancement\recipes\building_blocks\glass_vertical_slab.json 409b9810939f4adfbd6ddbd377f0bf694a716010 data\vanilla-plus-plus\advancement\recipes\building_blocks\crimson_shelf.json +c314f270ccc0404b298cbdc113b0ef26ce041f0f data\vanilla-plus-plus\advancement\recipes\combat\stone_dagger.json e3ef523506fa5ddf115ecd0dc796a3f4d83889ad data\vanilla-plus-plus\recipe\granite_vertical_slab.json 88f7ffe510023998b18cef5c56c02b93e16b1f9f data\vanilla-plus-plus\recipe\dark_prismarine_vertical_slab.json 954a85e6e273fdcf992e11a1e3fe8d4c85816b30 data\vanilla-plus-plus\recipe\oxidized_cut_copper_vertical_slab.json +01e66fbbd962a8802a21ff3c416ba012c08102e6 data\vanilla-plus-plus\recipe\dynamite.json 6e6d1c12323c76a67c3b880aa4e3f2837942007e data\vanilla-plus-plus\advancement\recipes\building_blocks\stone_brick_vertical_slab.json +2728b1e9a55318e450fd94a1997560b4928bd69d data\vanilla-plus-plus\recipe\diamond_hammer.json 59ebd82640a935d048e3651a7f8e951830b2011b data\vanilla-plus-plus\recipe\dark_oak_shelf.json fc29a050a78c0d6239701e62fe9c69d7083a3545 data\vanilla-plus-plus\advancement\recipes\building_blocks\mangrove_log_vertical_slab.json 35c0bf5ff2afb10b1fc2c136b1dc6be98c1e091d data\vanilla-plus-plus\advancement\recipes\building_blocks\stripped_spruce_log_vertical_slab.json 0713722845a04c95814688efa7eebd1dcac950f3 data\vanilla-plus-plus\advancement\recipes\building_blocks\polished_andesite_vertical_slab.json +5c927b37dceb764708dab6d5bbcafc46cbaad712 data\vanilla-plus-plus\advancement\recipes\tools\golden_hammer.json 65747c6f56caaabc30f581dca733b55369578764 data\vanilla-plus-plus\recipe\cherry_planks_vertical_slab.json cf2de44e45e4b160d7d8dba64043079304894112 data\vanilla-plus-plus\advancement\recipes\building_blocks\jungle_log_slab.json 1958a52f85c63f4db72b8cb56eb859279361d0ac data\vanilla-plus-plus\recipe\cut_red_sandstone_vertical_slab.json @@ -245,8 +265,10 @@ d66aa6bb940e5dd034c797367d1ad74617178c1d data\vanilla-plus-plus\recipe\nether_br bea5a52e9a1fd7495c2ec5900eefb8d632b4affc data\vanilla-plus-plus\advancement\recipes\building_blocks\brick_vertical_slab.json 250016e72eb3d493ea19fb0d4985c1d74fb0ee59 data\vanilla-plus-plus\recipe\polished_blackstone_brick_vertical_slab.json c0bba3ddff706d17c44ef9ead787387408c3c32c data\vanilla-plus-plus\recipe\red_sandstone_pressure_plate.json +b2fe43cd0e42ab65ca3ecda36d80eeeafe6c0ded data\vanilla-plus-plus\advancement\recipes\combat\wooden_dagger.json 873e2c8dc3f00584fc6b0c2c554b5ff521843d47 data\vanilla-plus-plus\advancement\recipes\building_blocks\oak_shelf.json 86576802d433b02098e127431008bdf7469ad472 data\vanilla-plus-plus\recipe\crimson_stem_slab.json +e6e0b0baa82efabe78dbd70ae91c53ff40d2e432 data\vanilla-plus-plus\advancement\recipes\combat\diamond_dagger.json fab830831a33d9313d6a6ef5f697c57164d4f695 data\vanilla-plus-plus\recipe\bamboo_mosaic_vertical_slab.json 534c9064db10f9a632971ac2094c3bae78c40ed8 data\vanilla-plus-plus\recipe\stripped_acacia_log_vertical_slab.json 10fe432b28e67b2cba4fec5124141e738772936c data\vanilla-plus-plus\recipe\smooth_sandstone_vertical_slab.json @@ -266,12 +288,14 @@ f28c368b024855e7687b98f6c4813862efd94680 data\vanilla-plus-plus\advancement\reci 8ad35cca519db5ea072c904cdcd4e49d18a7cab1 data\vanilla-plus-plus\advancement\recipes\building_blocks\crimson_stem_vertical_slab.json 1c41e0ba5b8c0997866f9626dc6f0ddd45b623dc data\vanilla-plus-plus\recipe\tuff_brick_vertical_slab.json 8b8b6c0c8695a2a848426e69b676a74f92f0016b data\vanilla-plus-plus\advancement\recipes\building_blocks\warped_shelf.json +b9664867e2a4841487cd6e9ec29409ef3db9b127 data\vanilla-plus-plus\advancement\recipes\combat\iron_dagger.json c9c86f3af1f6e3c976fee1a5775625d744e90186 data\vanilla-plus-plus\recipe\polished_tuff_vertical_slab.json 043daaeaa467a2314ece88ae65c3a6052e16326f data\vanilla-plus-plus\advancement\recipes\building_blocks\waxed_weathered_cut_copper_vertical_slab.json dce9a972a1f722f3f429d1821328a5e8e03a48da data\vanilla-plus-plus\advancement\recipes\building_blocks\waxed_exposed_cut_copper_vertical_slab.json 988e1c98db42bbc6a9b25f57580af3dad6f0cd6e data\vanilla-plus-plus\advancement\recipes\building_blocks\white_stained_glass_horizontal_pane.json 4b03a99a1ffb683f8de4732e972f9370cb866eb7 data\vanilla-plus-plus\advancement\recipes\building_blocks\gray_stained_glass_horizontal_pane.json f400ea608dbbea4672c2ff33cae42b0437f087d9 data\vanilla-plus-plus\recipe\black_stained_glass_horizontal_pane.json +79ec09e12a0bb5b4a013f85814736170675619f6 data\vanilla-plus-plus\advancement\recipes\tools\diamond_hammer.json 7b0084ea416007520e6ac83e5ca5bbe85ded64cc data\vanilla-plus-plus\recipe\spruce_log_slab.json 6555a909490ce8f647dc4b9f7d0e938001badd05 data\vanilla-plus-plus\recipe\mangrove_shelf.json dd8f8bf75b36433eb46e15f548b91e9a16ae56b4 data\vanilla-plus-plus\advancement\recipes\building_blocks\prismarine_vertical_slab.json @@ -285,6 +309,7 @@ ba06aea6ba0b08c14c512aeb82ebca1841a0aeff data\vanilla-plus-plus\recipe\emerald_v 50055709d5fed6caf42888f1aa56ac5769aa0f28 data\vanilla-plus-plus\advancement\recipes\building_blocks\polished_deepslate_pressure_plate.json ac879c7bbef93088289aace19221fdbe20c5e0ef data\vanilla-plus-plus\advancement\recipes\building_blocks\emerald_vertical_slab.json 18ab7320987bd7f55016882870d8b85b26d4f0bf data\vanilla-plus-plus\advancement\recipes\building_blocks\acacia_shelf.json +a5d3637f89999ea19eceb08bd8889acff0f27a2a data\vanilla-plus-plus\recipe\iron_dagger.json 32eb921dacc50108722e97610cffa7d061782c66 data\vanilla-plus-plus\advancement\recipes\building_blocks\crimson_planks_vertical_slab.json 766b2fc23f2fa86825c25fd1377c4de3f83ed0ce data\vanilla-plus-plus\advancement\recipes\building_blocks\bamboo_vertical_slab.json 006dd214d4c7bc3877182c115e555fc57f8bebc4 data\vanilla-plus-plus\advancement\recipes\building_blocks\cut_copper_vertical_slab.json diff --git a/src/main/generated/.cache/f95f3909fa5376a923e6ce0f3a8c68c99c1f208d b/src/main/generated/.cache/f95f3909fa5376a923e6ce0f3a8c68c99c1f208d new file mode 100644 index 0000000..73a5d24 --- /dev/null +++ b/src/main/generated/.cache/f95f3909fa5376a923e6ce0f3a8c68c99c1f208d @@ -0,0 +1,3 @@ +// 1.21.1 2024-11-25T18:13:00.39344 vanilla-plus-plus/Tags for minecraft:item +25c3b8ed0dd1dc9e8bf01d141073a49891fceed0 data\vanilla-plus-plus\tags\item\hammers.json +768ca56c9a279f90d328fec6e724e2acaa15cb4c data\minecraft\tags\item\swords.json diff --git a/src/main/generated/.cache/feae7a3569acbbdb0a59ada6c21aedcdd9e080b7 b/src/main/generated/.cache/feae7a3569acbbdb0a59ada6c21aedcdd9e080b7 index 1d250bd..29a2250 100644 --- a/src/main/generated/.cache/feae7a3569acbbdb0a59ada6c21aedcdd9e080b7 +++ b/src/main/generated/.cache/feae7a3569acbbdb0a59ada6c21aedcdd9e080b7 @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-23T19:09:57.7634493 vanilla-plus-plus/Model Definitions +// 1.21.1 2024-11-25T18:13:00.3820385 vanilla-plus-plus/Model Definitions f566250bb87f9eecee0ca3c4a7b91ec30275fca9 assets\vanilla-plus-plus\models\block\mossy_cobblestone_pressure_plate_down.json b50349827b171a3b1db42a7ce158f8680d8e50da assets\vanilla-plus-plus\models\block\birch_log_vertical_slab_east.json 31ff31b85a62bc715fe909383fa19092190778c8 assets\vanilla-plus-plus\models\item\brick_vertical_slab.json @@ -18,7 +18,6 @@ f76f2aab7b4f53b22a8e16b994dd957a158d10c3 assets\vanilla-plus-plus\models\block\n bec629d28cd4d114b9932eddea09012c38b2d347 assets\vanilla-plus-plus\blockstates\dark_oak_log_slab.json 9c2cbd7597d43e4878556f4ff19601dd5844e921 assets\vanilla-plus-plus\models\item\diorite_vertical_slab.json e2ac010f235f39c4b69692d988a603b5f4a3fc28 assets\vanilla-plus-plus\blockstates\brown_stained_glass_horizontal_pane.json -2f8b0197346cea7f3f00b1c0808d901da6741019 assets\vanilla-plus-plus\models\item\grapes.json ad4b25e769821fc89fb9e5720b19ae8534ed3a35 assets\vanilla-plus-plus\models\item\mossy_cobblestone_pressure_plate.json 06d2a50da34184a03ebb2d6af36d5374110e1a5a assets\vanilla-plus-plus\models\item\exposed_cut_copper_vertical_slab.json 7e06ad5c7fedaa07875c9c4bc4dfd4ca506a4062 assets\vanilla-plus-plus\models\item\stripped_acacia_log_vertical_slab.json @@ -51,10 +50,10 @@ ab63325885b0570040c1c1bcd9606ef20dc59ab1 assets\vanilla-plus-plus\models\block\m 80b797ffa13300e50a84a357f6f99c5c88a7860c assets\vanilla-plus-plus\models\item\glass_vertical_slab.json ceb86dc886accd7241004fa5d83413880790acff assets\vanilla-plus-plus\models\block\purpur_vertical_slab_south.json 433ce94443834a41c2aa65e2cbd4b85fe4686442 assets\vanilla-plus-plus\blockstates\spruce_shelf.json +e929292ec93b399654713169b4c0e6c9941e9015 assets\vanilla-plus-plus\models\item\golden_dagger.json b0dccac6fb3a925da7cbb99db67991f5f3ca0a05 assets\vanilla-plus-plus\models\block\tuff_vertical_slab.json ce040f8259bd18aaf05e1c100e202f6ab45bf0b9 assets\vanilla-plus-plus\models\block\dark_oak_log_vertical_slab_double_north.json d44f6229f3fa7b8b0177bf9e255fa889eb60cddf assets\vanilla-plus-plus\blockstates\bamboo_mosaic_vertical_slab.json -4a30a7e3e59f4f4b69d1241589d7c39c13b8fdb6 assets\vanilla-plus-plus\models\item\cherries.json d8bf1bab6684bfd00347c7c3d86769b7d513fe0b assets\vanilla-plus-plus\models\block\stripped_crimson_stem_slab_double.json b0208d117f75743e3b82d5a06b3cc018dc268712 assets\vanilla-plus-plus\models\block\stone_vertical_slab.json 76d4470c15eec53a0a4dc614d7d417d384ea0f9e assets\vanilla-plus-plus\models\block\oak_log_vertical_slab.json @@ -127,8 +126,9 @@ f86af2ed4e5dec3fe1df4752d078d28ae7facf08 assets\vanilla-plus-plus\models\block\d 96b9075a840d549d337ef8bcb382e1a7affe114c assets\vanilla-plus-plus\blockstates\emerald_slab.json e165e0739c6c00b1e68474a1cfc1c4bdb0c23ef5 assets\vanilla-plus-plus\models\block\waxed_weathered_cut_copper_vertical_slab_east.json 9310f0b53ec3e49c878652a15ee208457c384430 assets\vanilla-plus-plus\models\block\red_nether_brick_vertical_slab_south.json -7986abf06d73b5ee9075eb26b9f087239bd77362 assets\vanilla-plus-plus\blockstates\polished_granite_vertical_slab.json +1f214c749b6cb28e99c71e13874f1304ed1e1b38 assets\vanilla-plus-plus\models\item\stone_dagger.json 2f0fc9ad780e4231ebbcf379ea9cb4c3162da9b8 assets\vanilla-plus-plus\blockstates\purple_stained_glass_horizontal_pane.json +7986abf06d73b5ee9075eb26b9f087239bd77362 assets\vanilla-plus-plus\blockstates\polished_granite_vertical_slab.json 2fd48ebf26c50694e2a4ea98fe4dc58849ebca16 assets\vanilla-plus-plus\blockstates\bamboo_vertical_slab.json 0778ababe26b2f2191f356511f886966b7ad7d58 assets\vanilla-plus-plus\models\block\mud_brick_vertical_slab_east.json 6d7f4cceafbc2cd81d79a04b0484016fd03cc91d assets\vanilla-plus-plus\models\item\polished_andesite_vertical_slab.json @@ -268,6 +268,7 @@ d7664ca022902d5d19d5e62b94656203efe0283a assets\vanilla-plus-plus\models\block\s b48ef64b982dd271685d933485df9784f5dfc32c assets\vanilla-plus-plus\models\block\stone_brick_vertical_slab.json 37485c0ff26f29874d2d09bffff92386c415d3c0 assets\vanilla-plus-plus\models\block\crimson_stem_vertical_slab_west.json 01148db7ff9d3c57484f76b3f4671620eb15b8c1 assets\vanilla-plus-plus\blockstates\stripped_cherry_log_vertical_slab.json +304e414c6e05683dbdb0e471fdc23b714b07d6e6 assets\vanilla-plus-plus\models\item\netherite_hammer.json 9a76b114f3c49302abcbfb4fe303f40a409dc7f1 assets\vanilla-plus-plus\models\block\mangrove_log_vertical_slab.json 74b13d24523e3acb3fbf3302eb88a74f95151fce assets\vanilla-plus-plus\models\block\stripped_mangrove_log_vertical_slab_west.json 2bac7b37bdb9d864eee96f22f360a2f531423410 assets\vanilla-plus-plus\blockstates\stripped_acacia_log_vertical_slab.json @@ -325,6 +326,7 @@ b346a17b05df3daad99b5c9e0c7cd9d2f018a039 assets\vanilla-plus-plus\models\block\e 9c6a61b75365bb441b2b08ec37a1c7e467300991 assets\vanilla-plus-plus\models\block\stripped_spruce_log_vertical_slab_east.json 402778171a522f2075246c2d295885ba73d7e93c assets\vanilla-plus-plus\models\item\granite_vertical_slab.json 42a6fe70a56372bdf516a3a50d19d42a58c1ac2e assets\vanilla-plus-plus\models\block\stripped_crimson_stem_slab.json +ba737d297fadcbb4fe101e41b7f390cd3cd1e63a assets\vanilla-plus-plus\models\item\wooden_dagger.json 007e0b850547ab2aecc3bc716b9f78653db4e1fc assets\vanilla-plus-plus\models\item\mangrove_log_vertical_slab.json e9665bfc226879745e8d1ae732dafc2aee48e807 assets\vanilla-plus-plus\models\item\magenta_stained_glass_horizontal_pane.json 931bcbffc162898fbd21677cfa8e38bd01a8273a assets\vanilla-plus-plus\models\item\oxidized_cut_copper_vertical_slab.json @@ -486,12 +488,14 @@ b6d08c27753dbc668da48f7ef64a9b33fc9ad5da assets\vanilla-plus-plus\models\block\g 2bdf0821f9c7c7546e93d297ee6650093033fe95 assets\vanilla-plus-plus\models\item\diamond_vertical_slab.json c9acc28848fb27b22f3aec7e087d91f8be2c748f assets\vanilla-plus-plus\models\block\stripped_dark_oak_log_vertical_slab_double_east.json 5a77e207f56f89873ed17125d045e62dd3e7e492 assets\vanilla-plus-plus\models\block\acacia_planks_vertical_slab_south.json +2607aab78f4627c13e4b607f20f44365818ade7f assets\vanilla-plus-plus\models\item\netherite_dagger.json 3d5259bd6678fcb58d304ea73851a86652e1329e assets\vanilla-plus-plus\blockstates\birch_log_slab.json 763675896002f632e489c72b82e4572385d2eb5d assets\vanilla-plus-plus\models\block\smooth_red_sandstone_vertical_slab_double_east.json eb9d881b7c6a19c56828f70957220fbe492cb9bb assets\vanilla-plus-plus\models\block\polished_blackstone_brick_vertical_slab_double_north.json df2aefe476712046c2d70f6416afb4671a2587c1 assets\vanilla-plus-plus\models\item\gold_slab.json 7b297aa34534d69c0667be7cc2cc13a0356c5c3a assets\vanilla-plus-plus\models\block\jungle_planks_vertical_slab_double_north.json 164a9d33847510dcc84ebb404b482fa034fca347 assets\vanilla-plus-plus\models\item\cherry_shelf.json +85d002ccf5fc3fb4936e7d0be65ec5c7a00c9b33 assets\vanilla-plus-plus\models\item\iron_hammer.json 8aea00caad09a5750af8ae20d8d9ce84719b6650 assets\vanilla-plus-plus\models\block\acacia_log_vertical_slab.json 226f342f1fc5468ebe23e192c7aeb5f0e127bd60 assets\vanilla-plus-plus\blockstates\nether_brick_vertical_slab.json 396c427ad5b2c9dfd84eedd945e61c2ce0ca9ec8 assets\vanilla-plus-plus\models\item\oak_shelf.json @@ -643,6 +647,7 @@ d35f5ae62fb6a6df07b33eb8cb94d730aa720c84 assets\vanilla-plus-plus\models\block\n 51a570ad4ddf28e628c25675258b5219bc405ed1 assets\vanilla-plus-plus\models\block\birch_log_vertical_slab_west.json 3542cd72f779441d8939bebf8238bb31431e6747 assets\vanilla-plus-plus\blockstates\orange_stained_glass_horizontal_pane.json c01fb9ef63396d6cf608758f353ff6bd7e52c3de assets\vanilla-plus-plus\models\item\smooth_sandstone_vertical_slab.json +b4691e45b79a99933d230765fa4b03abac6d4c40 assets\vanilla-plus-plus\models\item\iron_dagger.json b57e29cbe758bc35cadcac0f41a698df7acf005d assets\vanilla-plus-plus\models\block\waxed_oxidized_cut_copper_vertical_slab_west.json 6b25147098f68ab3720654d214a88e13fecaeff0 assets\vanilla-plus-plus\models\block\stripped_oak_log_slab_double.json 51e373e8c1faf0b2f2d78e26afce275a8184d95a assets\vanilla-plus-plus\blockstates\cyan_stained_glass_horizontal_pane.json @@ -665,11 +670,12 @@ a440a8371477d726b6cecc37d3f537714f03a468 assets\vanilla-plus-plus\models\item\ju 995705c6491455e310538c58739eb765c5ceae76 assets\vanilla-plus-plus\models\block\polished_granite_vertical_slab_west.json 93512896a1df4146ac16d79ecc266c8e2267e428 assets\vanilla-plus-plus\blockstates\crimson_shelf.json b0367c83571f55b5e91a1364e99781225e59936f assets\vanilla-plus-plus\models\item\jungle_planks_vertical_slab.json +e969df4c954154d5dac971d399561826a72fa750 assets\vanilla-plus-plus\models\item\wooden_hammer.json 6f17d5e07d18bee5ef1523f706e10f01405af3e9 assets\vanilla-plus-plus\blockstates\mossy_cobblestone_vertical_slab.json 18b08843816f05f53d24b194ecd1386e490f0a0e assets\vanilla-plus-plus\models\block\stripped_warped_stem_vertical_slab_double_north.json 09d8328b4ff0a9de28e4e4df5cb222c44da0cc3e assets\vanilla-plus-plus\models\block\mossy_cobblestone_vertical_slab.json -ad4e3398ddff76ca91b76db1886b3b3bf8050459 assets\vanilla-plus-plus\models\block\deepslate_tile_vertical_slab.json d9b26636af4bf0c9b522beb72837a707c235980b assets\vanilla-plus-plus\blockstates\yellow_stained_glass_horizontal_pane.json +ad4e3398ddff76ca91b76db1886b3b3bf8050459 assets\vanilla-plus-plus\models\block\deepslate_tile_vertical_slab.json 7504f069db9f472eaafeb5d12359b61fe978bc94 assets\vanilla-plus-plus\blockstates\stripped_warped_stem_vertical_slab.json 99e25d02b596274df7274ee9d80688546bb70544 assets\vanilla-plus-plus\models\item\purple_stained_glass_horizontal_pane.json df5dc383454ddc3ffe219622f8b437c05bb1c498 assets\vanilla-plus-plus\models\block\stripped_spruce_log_slab.json @@ -701,10 +707,10 @@ f6d5626613835f106922886950dd91dea5ad9c54 assets\vanilla-plus-plus\models\block\o 045ccf01c3375fa436d926e55471d5f2c881973e assets\vanilla-plus-plus\models\item\quartz_vertical_slab.json 668eea5f052988753718a386f4b7993d6e298c1b assets\vanilla-plus-plus\models\block\oxidized_cut_copper_vertical_slab.json 98f34c4c064a277053454f7f85f92fff9f147192 assets\vanilla-plus-plus\models\block\crimson_stem_vertical_slab_east.json -1f517e4a23565f267fd991ed8fa020264793c3e3 assets\vanilla-plus-plus\models\item\dark_oak_log_slab.json 4c49388fe54266efdc684781c0fb90879067e401 assets\vanilla-plus-plus\models\block\stone_brick_vertical_slab_south.json -99afedf4e0e2c8f8af1e85b8caddfd90c64c7c31 assets\vanilla-plus-plus\blockstates\stripped_mangrove_log_slab.json +1f517e4a23565f267fd991ed8fa020264793c3e3 assets\vanilla-plus-plus\models\item\dark_oak_log_slab.json f6a083f16c0cc3e123af74a506001e6177f6ce78 assets\vanilla-plus-plus\blockstates\stripped_mangrove_log_vertical_slab.json +99afedf4e0e2c8f8af1e85b8caddfd90c64c7c31 assets\vanilla-plus-plus\blockstates\stripped_mangrove_log_slab.json 4a490f691005b1536346b1b73b5f21f38d13eb88 assets\vanilla-plus-plus\models\block\stripped_mangrove_log_vertical_slab_south.json f2d4bd3f2e2dee53578eb7cc7788985356692632 assets\vanilla-plus-plus\models\block\jungle_shelf.json 39561987fc599cfc791b9a267967e7f85523d89a assets\vanilla-plus-plus\models\block\mangrove_shelf_south.json @@ -819,6 +825,7 @@ e8a08da9fb1401764ea14a217eae6c2b2a9341cf assets\vanilla-plus-plus\models\block\w f5675caf613eb0ab1f494b15c880eb36d4d8e629 assets\vanilla-plus-plus\models\block\acacia_log_slab_top.json a278801d40d702b7ddcc83c3eb4aa159972e5d10 assets\vanilla-plus-plus\models\item\bamboo_vertical_slab.json 3080af0d1f770101117aecfbddf0619031746e36 assets\vanilla-plus-plus\models\block\red_nether_brick_vertical_slab.json +733bfbbc3df06cded0af9f060087586c86ab80ee assets\vanilla-plus-plus\models\item\diamond_hammer.json e770883d2106e2e54ab09eb0481606c254ab28a7 assets\vanilla-plus-plus\models\block\red_stained_glass_horizontal_pane.json 24a1426b7d737054f8477027e0c4f9b9788abe9e assets\vanilla-plus-plus\models\block\stripped_jungle_log_vertical_slab_east.json 3ba6312ad1c0962da53ec02bd519a0d8682da8e4 assets\vanilla-plus-plus\models\block\blackstone_vertical_slab_double_north.json @@ -844,8 +851,8 @@ b4925ec390ff389263928e7ed310078d8d9d6d50 assets\vanilla-plus-plus\models\block\a 09222d7fa62fe618043b2a4e1ee387c7013a1aff assets\vanilla-plus-plus\blockstates\spruce_planks_vertical_slab.json cb97a1dafa575420ea780285e573f700f9834ce1 assets\vanilla-plus-plus\models\item\polished_deepslate_vertical_slab.json 9d059dd7a9b8db9bf42089fc264e87593b0d0791 assets\vanilla-plus-plus\models\block\lapis_slab_double.json -bf9c674c9de24168f6f8279876b92233c78d9f57 assets\vanilla-plus-plus\models\block\stripped_mangrove_log_vertical_slab_double_east.json 476aa2632764352190731c3fbb10374e02576726 assets\vanilla-plus-plus\models\block\jungle_log_vertical_slab.json +bf9c674c9de24168f6f8279876b92233c78d9f57 assets\vanilla-plus-plus\models\block\stripped_mangrove_log_vertical_slab_double_east.json bb3a7ad08d1df7d6a7031f4c6f9d70bad637e0f0 assets\vanilla-plus-plus\models\block\dark_prismarine_vertical_slab_south.json 960cc925548598dca55a63d80b59c1cde6860464 assets\vanilla-plus-plus\blockstates\pink_stained_glass_horizontal_pane.json 967b1627ea892e01b902d6c40b2a0b5b9fea4dcc assets\vanilla-plus-plus\models\item\lapis_slab.json @@ -899,6 +906,7 @@ c781fb96f0a24de7767d840989567e147393548c assets\vanilla-plus-plus\models\block\c 602df6be145045bcd064b74c0c663559b71b01a9 assets\vanilla-plus-plus\models\block\brick_vertical_slab_south.json 7a5e36f7d37b9c0d012b4fb9592b3d35bf946823 assets\vanilla-plus-plus\models\block\stone_vertical_slab_west.json 91a5778f9a306948e9d65c39ffc2a9d07b806b7e assets\vanilla-plus-plus\blockstates\jungle_planks_vertical_slab.json +ad6f16da6bf3eb2e8c5349b89d6151bf8227fe0e assets\vanilla-plus-plus\models\item\stone_hammer.json 14610f99b32fbd49c5c47a6da3b394d213f9ebb6 assets\vanilla-plus-plus\models\block\cherry_planks_vertical_slab_east.json 7472f2083c58f20237b68a59c1d72ec35cfa508f assets\vanilla-plus-plus\models\block\cut_copper_vertical_slab_double_east.json 5e1419ef6284270fd194fb3203391ca0bf65f98b assets\vanilla-plus-plus\models\block\cobbled_deepslate_vertical_slab_east.json @@ -944,6 +952,7 @@ cb9cf5344ce2916a10bcb47224a8577cc23bd724 assets\vanilla-plus-plus\blockstates\ac e06e1d6907c80bb9e192525b3bcd3c11600ca1bd assets\vanilla-plus-plus\models\block\weathered_cut_copper_vertical_slab_west.json b168510bccdc36b7b2b7b4b9efc9b466ff736f9e assets\vanilla-plus-plus\models\item\warped_shelf.json b36a8b212c4c1de2cf57cc35291e5d3604d2c1f5 assets\vanilla-plus-plus\models\block\warped_stem_vertical_slab_west.json +1a1c85e693a38b873ffd191f0abcf625b3c3bb10 assets\vanilla-plus-plus\models\item\golden_hammer.json 0f74066ba2538693c669f4cf9e7f635b62483ffd assets\vanilla-plus-plus\blockstates\stripped_birch_log_vertical_slab.json 0b65aa89cba9c2bab9b0b2cd163abad16fd8451f assets\vanilla-plus-plus\models\block\warped_shelf_west.json 69848742a73973844f828265d2ae31c084e16f7e assets\vanilla-plus-plus\models\block\dark_prismarine_vertical_slab.json @@ -971,6 +980,7 @@ fbef00090b1a160c9a7814ae66d7fef677c0a3c4 assets\vanilla-plus-plus\blockstates\cu c9ba45544e8a2636ae6af9b9f183bd0e401f7413 assets\vanilla-plus-plus\models\block\cyan_stained_glass_horizontal_pane.json aa4db8c74c3ac2d4b2c1cde3ed468bd8fec07f0c assets\vanilla-plus-plus\models\block\stripped_warped_stem_slab.json 13aa3670724485963177d5ab322361332ac20e67 assets\vanilla-plus-plus\models\block\birch_planks_vertical_slab_south.json +6bbd1c49d4537204045efdc4e41629ac82844193 assets\vanilla-plus-plus\models\item\diamond_dagger.json 04e8c96b3afab4a1dc400bd31e2a75f9120b1c77 assets\vanilla-plus-plus\models\block\birch_log_slab.json 82bdcde357d6bea240116542ee109a3819424834 assets\vanilla-plus-plus\models\block\gold_vertical_slab_south.json b4d18c85d386155d3a9a7218949c880c42ee4b24 assets\vanilla-plus-plus\models\block\acacia_shelf_south.json diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/cherries.json b/src/main/generated/assets/vanilla-plus-plus/models/item/cherries.json deleted file mode 100644 index d1ac151..0000000 --- a/src/main/generated/assets/vanilla-plus-plus/models/item/cherries.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "vanilla-plus-plus:item/cherries" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_dagger.json new file mode 100644 index 0000000..d19d156 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/diamond_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_hammer.json new file mode 100644 index 0000000..51d72b3 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/diamond_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/diamond_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/golden_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/golden_dagger.json new file mode 100644 index 0000000..fd4f199 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/golden_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/golden_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/golden_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/golden_hammer.json new file mode 100644 index 0000000..6beb188 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/golden_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/golden_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/grapes.json b/src/main/generated/assets/vanilla-plus-plus/models/item/grapes.json deleted file mode 100644 index 77f0639..0000000 --- a/src/main/generated/assets/vanilla-plus-plus/models/item/grapes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "vanilla-plus-plus:item/grapes" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/iron_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/iron_dagger.json new file mode 100644 index 0000000..138590e --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/iron_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/iron_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/iron_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/iron_hammer.json new file mode 100644 index 0000000..53ee126 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/iron_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/iron_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_dagger.json new file mode 100644 index 0000000..66cb285 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/netherite_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_hammer.json new file mode 100644 index 0000000..4e7d38f --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/netherite_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/netherite_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/stone_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/stone_dagger.json new file mode 100644 index 0000000..f7d0c51 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/stone_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/stone_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/stone_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/stone_hammer.json new file mode 100644 index 0000000..dd7624d --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/stone_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/stone_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_dagger.json b/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_dagger.json new file mode 100644 index 0000000..169a530 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/wooden_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_hammer.json b/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_hammer.json new file mode 100644 index 0000000..65a1651 --- /dev/null +++ b/src/main/generated/assets/vanilla-plus-plus/models/item/wooden_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "vanilla-plus-plus:item/wooden_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/swords.json b/src/main/generated/data/minecraft/tags/item/swords.json new file mode 100644 index 0000000..cad2ed2 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/swords.json @@ -0,0 +1,10 @@ +{ + "values": [ + "vanilla-plus-plus:wooden_dagger", + "vanilla-plus-plus:stone_dagger", + "vanilla-plus-plus:iron_dagger", + "vanilla-plus-plus:golden_dagger", + "vanilla-plus-plus:diamond_dagger", + "vanilla-plus-plus:netherite_dagger" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/diamond_dagger.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/diamond_dagger.json new file mode 100644 index 0000000..0e619f2 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/diamond_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:diamond_dagger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:diamond_dagger" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/golden_dagger.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/golden_dagger.json new file mode 100644 index 0000000..ae0eebf --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/golden_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:golden_dagger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:golden_dagger" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/iron_dagger.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/iron_dagger.json new file mode 100644 index 0000000..c413f84 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/iron_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:iron_dagger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:iron_dagger" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/netherite_dagger_smithing.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/netherite_dagger_smithing.json new file mode 100644 index 0000000..9a4918c --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/netherite_dagger_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:netherite_dagger_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:netherite_dagger_smithing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/stone_dagger.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/stone_dagger.json new file mode 100644 index 0000000..db197d6 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/stone_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:stone_dagger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:stone_dagger" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/wooden_dagger.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/wooden_dagger.json new file mode 100644 index 0000000..a102200 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/combat/wooden_dagger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:wooden_dagger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:wooden_dagger" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/diamond_hammer.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/diamond_hammer.json new file mode 100644 index 0000000..718da1f --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/diamond_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:diamond_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:diamond_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/golden_hammer.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/golden_hammer.json new file mode 100644 index 0000000..afcb861 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/golden_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:golden_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:golden_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/iron_hammer.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/iron_hammer.json new file mode 100644 index 0000000..a9cf3c5 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/iron_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:iron_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:iron_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/netherite_hammer_smithing.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/netherite_hammer_smithing.json new file mode 100644 index 0000000..3a9c994 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/netherite_hammer_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:netherite_hammer_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:netherite_hammer_smithing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/stone_hammer.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/stone_hammer.json new file mode 100644 index 0000000..cad80b6 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/stone_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:stone_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:stone_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/wooden_hammer.json b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/wooden_hammer.json new file mode 100644 index 0000000..23b9ec3 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/advancement/recipes/tools/wooden_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vanilla-plus-plus:wooden_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "vanilla-plus-plus:wooden_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/diamond_dagger.json b/src/main/generated/data/vanilla-plus-plus/recipe/diamond_dagger.json new file mode 100644 index 0000000..f72ff79 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/diamond_dagger.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "dagger", + "key": { + "O": { + "item": "minecraft:diamond" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "O", + "S" + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:diamond_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/diamond_hammer.json b/src/main/generated/data/vanilla-plus-plus/recipe/diamond_hammer.json new file mode 100644 index 0000000..e99b57e --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/diamond_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "hammer", + "key": { + "O": { + "item": "minecraft:diamond" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "OOO", + " S " + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:diamond_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/dynamite.json b/src/main/generated/data/vanilla-plus-plus/recipe/dynamite.json new file mode 100644 index 0000000..3fa8a01 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/dynamite.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:dynamite", + "category": "misc" +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/golden_dagger.json b/src/main/generated/data/vanilla-plus-plus/recipe/golden_dagger.json new file mode 100644 index 0000000..120208f --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/golden_dagger.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "dagger", + "key": { + "O": { + "item": "minecraft:gold_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "O", + "S" + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:golden_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/golden_hammer.json b/src/main/generated/data/vanilla-plus-plus/recipe/golden_hammer.json new file mode 100644 index 0000000..09d2654 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/golden_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "hammer", + "key": { + "O": { + "item": "minecraft:gold_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "OOO", + " S " + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:golden_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/iron_dagger.json b/src/main/generated/data/vanilla-plus-plus/recipe/iron_dagger.json new file mode 100644 index 0000000..acfee5e --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/iron_dagger.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "dagger", + "key": { + "O": { + "item": "minecraft:iron_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "O", + "S" + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:iron_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/iron_hammer.json b/src/main/generated/data/vanilla-plus-plus/recipe/iron_hammer.json new file mode 100644 index 0000000..eefc6d1 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/iron_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "hammer", + "key": { + "O": { + "item": "minecraft:iron_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "OOO", + " S " + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:iron_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/netherite_dagger_smithing.json b/src/main/generated/data/vanilla-plus-plus/recipe/netherite_dagger_smithing.json new file mode 100644 index 0000000..3da3b14 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/netherite_dagger_smithing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "vanilla-plus-plus:diamond_dagger" + }, + "result": { + "count": 1, + "id": "vanilla-plus-plus:netherite_dagger" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/netherite_hammer_smithing.json b/src/main/generated/data/vanilla-plus-plus/recipe/netherite_hammer_smithing.json new file mode 100644 index 0000000..8d765ae --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/netherite_hammer_smithing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "vanilla-plus-plus:diamond_hammer" + }, + "result": { + "count": 1, + "id": "vanilla-plus-plus:netherite_hammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/stone_dagger.json b/src/main/generated/data/vanilla-plus-plus/recipe/stone_dagger.json new file mode 100644 index 0000000..77e77c1 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/stone_dagger.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "dagger", + "key": { + "O": { + "tag": "minecraft:stone_tool_materials" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "O", + "S" + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:stone_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/stone_hammer.json b/src/main/generated/data/vanilla-plus-plus/recipe/stone_hammer.json new file mode 100644 index 0000000..a6f3b7d --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/stone_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "hammer", + "key": { + "O": { + "tag": "minecraft:stone_tool_materials" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "OOO", + " S " + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:stone_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/wooden_dagger.json b/src/main/generated/data/vanilla-plus-plus/recipe/wooden_dagger.json new file mode 100644 index 0000000..5cbad18 --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/wooden_dagger.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "dagger", + "key": { + "O": { + "tag": "minecraft:planks" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "O", + "S" + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:wooden_dagger" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/recipe/wooden_hammer.json b/src/main/generated/data/vanilla-plus-plus/recipe/wooden_hammer.json new file mode 100644 index 0000000..49b361a --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/recipe/wooden_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "hammer", + "key": { + "O": { + "tag": "minecraft:planks" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "OOO", + " S " + ], + "result": { + "count": 1, + "id": "vanilla-plus-plus:wooden_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/vanilla-plus-plus/tags/item/hammers.json b/src/main/generated/data/vanilla-plus-plus/tags/item/hammers.json new file mode 100644 index 0000000..45715ee --- /dev/null +++ b/src/main/generated/data/vanilla-plus-plus/tags/item/hammers.json @@ -0,0 +1,10 @@ +{ + "values": [ + "vanilla-plus-plus:wooden_hammer", + "vanilla-plus-plus:stone_hammer", + "vanilla-plus-plus:iron_hammer", + "vanilla-plus-plus:golden_hammer", + "vanilla-plus-plus:diamond_hammer", + "vanilla-plus-plus:netherite_hammer" + ] +} \ No newline at end of file diff --git a/src/main/java/com/kayhennig/vanplusplus/ModBlocks.java b/src/main/java/com/kayhennig/vanplusplus/ModBlocks.java index afc9ba8..9f26508 100644 --- a/src/main/java/com/kayhennig/vanplusplus/ModBlocks.java +++ b/src/main/java/com/kayhennig/vanplusplus/ModBlocks.java @@ -588,6 +588,24 @@ private static void addBlockToFunctionalBlockGroup(FabricItemGroupEntries entrie entries.addAfter(Blocks.CRIMSON_PLANKS, CRIMSON_SHELF); entries.addAfter(Blocks.WARPED_PLANKS, WARPED_SHELF); } + + private static void addBlockToRedstoneBlockGroup(FabricItemGroupEntries entries) { + entries.addAfter(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, COBBLESTONE_PRESSURE_PLATE); + entries.addAfter(COBBLESTONE_PRESSURE_PLATE, MOSSY_COBBLESTONE_PRESSURE_PLATE); + entries.addAfter(MOSSY_COBBLESTONE_PRESSURE_PLATE, SMOOTH_STONE_PRESSURE_PLATE); + entries.addAfter(SMOOTH_STONE_PRESSURE_PLATE, STONE_BRICK_PRESSURE_PLATE); + entries.addAfter(STONE_BRICK_PRESSURE_PLATE, MOSSY_STONE_BRICK_PRESSURE_PLATE); + entries.addAfter(MOSSY_STONE_BRICK_PRESSURE_PLATE, POLISHED_DEEPSLATE_PRESSURE_PLATE); + entries.addAfter(POLISHED_DEEPSLATE_PRESSURE_PLATE, DEEPSLATE_BRICK_PRESSURE_PLATE); + entries.addAfter(DEEPSLATE_BRICK_PRESSURE_PLATE, BRICK_PRESSURE_PLATE); + entries.addAfter(BRICK_PRESSURE_PLATE, MUD_BRICK_PRESSURE_PLATE); + entries.addAfter(MUD_BRICK_PRESSURE_PLATE, SANDSTONE_PRESSURE_PLATE); + entries.addAfter(SANDSTONE_PRESSURE_PLATE, RED_SANDSTONE_PRESSURE_PLATE); + entries.addAfter(RED_SANDSTONE_PRESSURE_PLATE, NETHER_BRICK_PRESSURE_PLATE); + entries.addAfter(NETHER_BRICK_PRESSURE_PLATE, RED_NETHER_BRICK_PRESSURE_PLATE); + entries.addAfter(RED_NETHER_BRICK_PRESSURE_PLATE, END_STONE_BRICK_PRESSURE_PLATE); + entries.addAfter(END_STONE_BRICK_PRESSURE_PLATE, QUARTZ_PRESSURE_PLATE); + } public static void registerModBlocks() { ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS) @@ -596,5 +614,6 @@ public static void registerModBlocks() { ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(ModBlocks::addBlockToNaturalBlockGroup); ItemGroupEvents.modifyEntriesEvent(ModItemGroups.VANPLUSPLUS).register(ModBlocks::addBlockToModBlockGroup); ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(ModBlocks::addBlockToFunctionalBlockGroup); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.REDSTONE).register(ModBlocks::addBlockToRedstoneBlockGroup); } } diff --git a/src/main/java/com/kayhennig/vanplusplus/ModItemTags.java b/src/main/java/com/kayhennig/vanplusplus/ModItemTags.java new file mode 100644 index 0000000..7ba2ef7 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/ModItemTags.java @@ -0,0 +1,16 @@ +package com.kayhennig.vanplusplus; + +import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +public final class ModItemTags { + public static final TagKey HAMMERS = of("hammers"); + private ModItemTags() { + } + + private static TagKey of(String id) { + return TagKey.of(RegistryKeys.ITEM, Identifier.of(Vanillaplusplus.MOD_ID, id)); + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/ModItems.java b/src/main/java/com/kayhennig/vanplusplus/ModItems.java index 0fc942f..3f0c78f 100644 --- a/src/main/java/com/kayhennig/vanplusplus/ModItems.java +++ b/src/main/java/com/kayhennig/vanplusplus/ModItems.java @@ -1,18 +1,38 @@ package com.kayhennig.vanplusplus; - +import com.kayhennig.vanplusplus.component.ModDataComponentTypes; +import com.kayhennig.vanplusplus.item.DaggerItem; +import com.kayhennig.vanplusplus.item.DynamiteItem; +import com.kayhennig.vanplusplus.item.HammerItem; import com.kayhennig.vanplusplus.item.ModItemGroups; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.component.type.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.ItemGroups; +import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.item.ToolMaterials; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; public class ModItems { + public static final Item DYNAMITE = registerItem("dynamite", new DynamiteItem(new Item.Settings().maxCount(16).component(ModDataComponentTypes.FUSE_TIME, (byte) 1))); + + public static final Item WOODEN_DAGGER = registerItem("wooden_dagger", new DaggerItem(ToolMaterials.WOOD, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.WOOD, 2, -1.8F)))); + public static final Item STONE_DAGGER = registerItem("stone_dagger", new DaggerItem(ToolMaterials.STONE, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.STONE, 2, -1.8F)))); + public static final Item IRON_DAGGER = registerItem("iron_dagger", new DaggerItem(ToolMaterials.IRON, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.IRON, 2, -1.8F)))); + public static final Item GOLDEN_DAGGER = registerItem("golden_dagger", new DaggerItem(ToolMaterials.GOLD, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.GOLD, 2, -1.8F)))); + public static final Item DIAMOND_DAGGER = registerItem("diamond_dagger", new DaggerItem(ToolMaterials.DIAMOND, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.DIAMOND, 2, -1.8F)))); + public static final Item NETHERITE_DAGGER = registerItem("netherite_dagger", new DaggerItem(ToolMaterials.NETHERITE, new Item.Settings().attributeModifiers(DaggerItem.createAttributeModifiers(ToolMaterials.NETHERITE, 2, -1.8F)))); + + public static final Item WOODEN_HAMMER = registerItem("wooden_hammer", new HammerItem(ToolMaterials.WOOD, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.WOOD, 5, -2.8F)))); + public static final Item STONE_HAMMER = registerItem("stone_hammer", new HammerItem(ToolMaterials.STONE, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.STONE, 5, -2.9F)))); + public static final Item IRON_HAMMER = registerItem("iron_hammer", new HammerItem(ToolMaterials.IRON, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.IRON, 5, -3.0F)))); + public static final Item GOLDEN_HAMMER = registerItem("golden_hammer", new HammerItem(ToolMaterials.GOLD, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.GOLD, 5, -3.0F)))); + public static final Item DIAMOND_HAMMER = registerItem("diamond_hammer", new HammerItem(ToolMaterials.DIAMOND, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.DIAMOND, 5, -3.0F)))); + public static final Item NETHERITE_HAMMER = registerItem("netherite_hammer", new HammerItem(ToolMaterials.NETHERITE, new Item.Settings().attributeModifiers(HammerItem.createAttributeModifiers(ToolMaterials.NETHERITE, 5, -3.0F)))); + private static Item registerItem(String name, Item item) { Identifier itemId = Identifier.of(Vanillaplusplus.MOD_ID, name); @@ -21,6 +41,52 @@ private static Item registerItem(String name, Item item) { return registeredItem; } + private static void addItemsToModGroup(FabricItemGroupEntries entries) { + addDynamites(entries); + entries.add(WOODEN_DAGGER); + entries.add(STONE_DAGGER); + entries.add(IRON_DAGGER); + entries.add(GOLDEN_DAGGER); + entries.add(DIAMOND_DAGGER); + entries.add(NETHERITE_DAGGER); + + entries.add(WOODEN_HAMMER); + entries.add(STONE_HAMMER); + entries.add(IRON_HAMMER); + entries.add(GOLDEN_HAMMER); + entries.add(DIAMOND_HAMMER); + entries.add(NETHERITE_HAMMER); + + } + + private static void addItemsToCombatGroup(FabricItemGroupEntries entries) { + addDynamites(entries); + + entries.addAfter(Items.NETHERITE_SWORD, WOODEN_DAGGER); + entries.addAfter(WOODEN_DAGGER, STONE_DAGGER); + entries.addAfter(STONE_DAGGER, IRON_DAGGER); + entries.addAfter(IRON_DAGGER, GOLDEN_DAGGER); + entries.addAfter(GOLDEN_DAGGER, DIAMOND_DAGGER); + entries.addAfter(DIAMOND_DAGGER, NETHERITE_DAGGER); + + entries.addAfter(NETHERITE_DAGGER, WOODEN_HAMMER); + entries.addAfter(WOODEN_HAMMER, STONE_HAMMER); + entries.addAfter(STONE_HAMMER, IRON_HAMMER); + entries.addAfter(IRON_HAMMER, GOLDEN_HAMMER); + entries.addAfter(GOLDEN_HAMMER, DIAMOND_HAMMER); + entries.addAfter(DIAMOND_HAMMER, NETHERITE_HAMMER); + } + + private static void addDynamites(FabricItemGroupEntries entries) { + for (byte b : DynamiteItem.FUSE_TIMES) { + ItemStack itemStack = new ItemStack(DYNAMITE); + itemStack.set(ModDataComponentTypes.FUSE_TIME, b); + entries.add(itemStack); + } + } + public static void registerItems() { + ItemGroupEvents.modifyEntriesEvent(ModItemGroups.VANPLUSPLUS).register(ModItems::addItemsToModGroup); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(ModItems::addItemsToCombatGroup); } } diff --git a/src/main/java/com/kayhennig/vanplusplus/Vanillaplusplus.java b/src/main/java/com/kayhennig/vanplusplus/Vanillaplusplus.java index 9b597fc..0d4b2c1 100644 --- a/src/main/java/com/kayhennig/vanplusplus/Vanillaplusplus.java +++ b/src/main/java/com/kayhennig/vanplusplus/Vanillaplusplus.java @@ -7,6 +7,7 @@ import com.kayhennig.vanplusplus.entity.ModBlockEntityType; import com.kayhennig.vanplusplus.item.ModItemGroups; +import com.kayhennig.vanplusplus.recipe.DynamiteRecipeSerializer; public class Vanillaplusplus implements ModInitializer { public static final String MOD_ID = "vanilla-plus-plus"; @@ -20,8 +21,9 @@ public class Vanillaplusplus implements ModInitializer { public void onInitialize() { ModBlocks.registerModBlocks(); ModItems.registerItems(); - ModItemGroups.init(); + ModItemGroups.initialize(); ModBlockEntityType.initialize(); + DynamiteRecipeSerializer.initialize(); } } \ No newline at end of file diff --git a/src/main/java/com/kayhennig/vanplusplus/VanillaplusplusDataGenerator.java b/src/main/java/com/kayhennig/vanplusplus/VanillaplusplusDataGenerator.java index 5229731..bd8fa86 100644 --- a/src/main/java/com/kayhennig/vanplusplus/VanillaplusplusDataGenerator.java +++ b/src/main/java/com/kayhennig/vanplusplus/VanillaplusplusDataGenerator.java @@ -1,6 +1,7 @@ package com.kayhennig.vanplusplus; import com.kayhennig.vanplusplus.datagen.ModBlockTagProvider; +import com.kayhennig.vanplusplus.datagen.ModItemTagProvider; import com.kayhennig.vanplusplus.datagen.ModLootTableProvider; import com.kayhennig.vanplusplus.datagen.ModModelProvider; import com.kayhennig.vanplusplus.datagen.ModRecipeProvider; @@ -17,5 +18,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(ModLootTableProvider::new); pack.addProvider(ModModelProvider::new); pack.addProvider(ModRecipeProvider::new); + pack.addProvider(ModItemTagProvider::new); } } diff --git a/src/main/java/com/kayhennig/vanplusplus/block/ShelfBlock.java b/src/main/java/com/kayhennig/vanplusplus/block/ShelfBlock.java index d75dda2..1a701e8 100644 --- a/src/main/java/com/kayhennig/vanplusplus/block/ShelfBlock.java +++ b/src/main/java/com/kayhennig/vanplusplus/block/ShelfBlock.java @@ -76,10 +76,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { if (direction.getAxis().isHorizontal()) { BlockState blockState = this.getDefaultState().with(HorizontalFacingBlock.FACING, direction.getOpposite()); if (blockState.canPlaceAt(ctx.getWorld(), ctx.getBlockPos())) { - // check if the block we want to attach to is a solid block - if (ctx.getWorld().getBlockState(ctx.getBlockPos().offset(direction)).isSolidBlock(ctx.getWorld(), ctx.getBlockPos().offset(direction))) { - return blockState; - } + return blockState; } } } diff --git a/src/main/java/com/kayhennig/vanplusplus/component/ModDataComponentTypes.java b/src/main/java/com/kayhennig/vanplusplus/component/ModDataComponentTypes.java new file mode 100644 index 0000000..168d870 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/component/ModDataComponentTypes.java @@ -0,0 +1,25 @@ +package com.kayhennig.vanplusplus.component; + +import java.util.function.UnaryOperator; + +import com.kayhennig.vanplusplus.Vanillaplusplus; +import com.mojang.serialization.Codec; + +import net.minecraft.component.ComponentType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ModDataComponentTypes { + public static final ComponentType FUSE_TIME = register( + "dynamite", builder -> builder.codec(Codec.BYTE) + ); + + private static ComponentType register(String id, UnaryOperator> builderOperator) { + return Registry.register(Registries.DATA_COMPONENT_TYPE, Identifier.of(Vanillaplusplus.MOD_ID, id), builderOperator.apply(ComponentType.builder()).build()); + } + + public static void initialize() { + // NO-OP + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/datagen/ModItemTagProvider.java b/src/main/java/com/kayhennig/vanplusplus/datagen/ModItemTagProvider.java new file mode 100644 index 0000000..7a82ab4 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/datagen/ModItemTagProvider.java @@ -0,0 +1,38 @@ +package com.kayhennig.vanplusplus.datagen; + +import java.util.concurrent.CompletableFuture; + +import com.kayhennig.vanplusplus.ModItemTags; +import com.kayhennig.vanplusplus.ModItems; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryWrapper.WrapperLookup; +import net.minecraft.registry.tag.ItemTags; + +public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { + public ModItemTagProvider(FabricDataOutput output, + CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + @Override + protected void configure(WrapperLookup wrapperLookup) { + getOrCreateTagBuilder(ItemTags.SWORDS) + .add(ModItems.WOODEN_DAGGER) + .add(ModItems.STONE_DAGGER) + .add(ModItems.IRON_DAGGER) + .add(ModItems.GOLDEN_DAGGER) + .add(ModItems.DIAMOND_DAGGER) + .add(ModItems.NETHERITE_DAGGER); + + getOrCreateTagBuilder(ModItemTags.HAMMERS) + .add(ModItems.WOODEN_HAMMER) + .add(ModItems.STONE_HAMMER) + .add(ModItems.IRON_HAMMER) + .add(ModItems.GOLDEN_HAMMER) + .add(ModItems.DIAMOND_HAMMER) + .add(ModItems.NETHERITE_HAMMER); + } + +} diff --git a/src/main/java/com/kayhennig/vanplusplus/datagen/ModLootTableProvider.java b/src/main/java/com/kayhennig/vanplusplus/datagen/ModLootTableProvider.java index 0abb40f..31ccf8e 100644 --- a/src/main/java/com/kayhennig/vanplusplus/datagen/ModLootTableProvider.java +++ b/src/main/java/com/kayhennig/vanplusplus/datagen/ModLootTableProvider.java @@ -29,6 +29,8 @@ public ModLootTableProvider(FabricDataOutput dataOutput, public void generate() { generateSlabs(); generateVerticalSlabs(); + generateShelfs(); + generatePressurePlates(); } private void generateSlabs() { @@ -153,7 +155,9 @@ private void generateVerticalSlabs() { addDrop(ModBlocks.POLISHED_BLACKSTONE_BRICK_VERTICAL_SLAB, verticalSlabDrops(ModBlocks.POLISHED_BLACKSTONE_BRICK_VERTICAL_SLAB)); addDrop(ModBlocks.END_STONE_BRICK_VERTICAL_SLAB, verticalSlabDrops(ModBlocks.END_STONE_BRICK_VERTICAL_SLAB)); addDrop(ModBlocks.PURPUR_VERTICAL_SLAB, verticalSlabDrops(ModBlocks.PURPUR_VERTICAL_SLAB)); + } + private void generateShelfs() { addDrop(ModBlocks.OAK_SHELF, drops(ModBlocks.OAK_SHELF)); addDrop(ModBlocks.SPRUCE_SHELF, drops(ModBlocks.SPRUCE_SHELF)); addDrop(ModBlocks.BIRCH_SHELF, drops(ModBlocks.BIRCH_SHELF)); @@ -164,7 +168,9 @@ private void generateVerticalSlabs() { addDrop(ModBlocks.CHERRY_SHELF, drops(ModBlocks.CHERRY_SHELF)); addDrop(ModBlocks.CRIMSON_SHELF, drops(ModBlocks.CRIMSON_SHELF)); addDrop(ModBlocks.WARPED_SHELF, drops(ModBlocks.WARPED_SHELF)); + } + private void generatePressurePlates() { addDrop(ModBlocks.COBBLESTONE_PRESSURE_PLATE, drops(ModBlocks.COBBLESTONE_PRESSURE_PLATE)); addDrop(ModBlocks.MOSSY_COBBLESTONE_PRESSURE_PLATE, drops(ModBlocks.MOSSY_COBBLESTONE_PRESSURE_PLATE)); addDrop(ModBlocks.SMOOTH_STONE_PRESSURE_PLATE, drops(ModBlocks.SMOOTH_STONE_PRESSURE_PLATE)); @@ -182,6 +188,7 @@ private void generateVerticalSlabs() { addDrop(ModBlocks.QUARTZ_PRESSURE_PLATE, drops(ModBlocks.QUARTZ_PRESSURE_PLATE)); } + public LootTable.Builder verticalSlabDrops(Block drop) { return LootTable.builder().pool( LootPool.builder().rolls( diff --git a/src/main/java/com/kayhennig/vanplusplus/datagen/ModModelProvider.java b/src/main/java/com/kayhennig/vanplusplus/datagen/ModModelProvider.java index a127d04..03f55d3 100644 --- a/src/main/java/com/kayhennig/vanplusplus/datagen/ModModelProvider.java +++ b/src/main/java/com/kayhennig/vanplusplus/datagen/ModModelProvider.java @@ -530,6 +530,20 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { Models.GENERATED.upload(ModelIds.getItemModelId(ModBlocks.GREEN_STAINED_GLASS_HORIZONTAL_PANE.asItem()), TextureMap.layer0(Blocks.GREEN_STAINED_GLASS), itemModelGenerator.writer); Models.GENERATED.upload(ModelIds.getItemModelId(ModBlocks.RED_STAINED_GLASS_HORIZONTAL_PANE.asItem()), TextureMap.layer0(Blocks.RED_STAINED_GLASS), itemModelGenerator.writer); Models.GENERATED.upload(ModelIds.getItemModelId(ModBlocks.BLACK_STAINED_GLASS_HORIZONTAL_PANE.asItem()), TextureMap.layer0(Blocks.BLACK_STAINED_GLASS), itemModelGenerator.writer); + + itemModelGenerator.register(ModItems.WOODEN_DAGGER, Models.HANDHELD); + itemModelGenerator.register(ModItems.STONE_DAGGER, Models.HANDHELD); + itemModelGenerator.register(ModItems.IRON_DAGGER, Models.HANDHELD); + itemModelGenerator.register(ModItems.GOLDEN_DAGGER, Models.HANDHELD); + itemModelGenerator.register(ModItems.DIAMOND_DAGGER, Models.HANDHELD); + itemModelGenerator.register(ModItems.NETHERITE_DAGGER, Models.HANDHELD); + + itemModelGenerator.register(ModItems.WOODEN_HAMMER, Models.HANDHELD); + itemModelGenerator.register(ModItems.STONE_HAMMER, Models.HANDHELD); + itemModelGenerator.register(ModItems.IRON_HAMMER, Models.HANDHELD); + itemModelGenerator.register(ModItems.GOLDEN_HAMMER, Models.HANDHELD); + itemModelGenerator.register(ModItems.DIAMOND_HAMMER, Models.HANDHELD); + itemModelGenerator.register(ModItems.NETHERITE_HAMMER, Models.HANDHELD); } } diff --git a/src/main/java/com/kayhennig/vanplusplus/datagen/ModRecipeProvider.java b/src/main/java/com/kayhennig/vanplusplus/datagen/ModRecipeProvider.java index d612bb0..412e9b7 100644 --- a/src/main/java/com/kayhennig/vanplusplus/datagen/ModRecipeProvider.java +++ b/src/main/java/com/kayhennig/vanplusplus/datagen/ModRecipeProvider.java @@ -3,6 +3,9 @@ import java.util.concurrent.CompletableFuture; import com.kayhennig.vanplusplus.ModBlocks; +import com.kayhennig.vanplusplus.ModItems; +import com.kayhennig.vanplusplus.Vanillaplusplus; +import com.kayhennig.vanplusplus.recipe.DynamiteRecipe; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; @@ -12,8 +15,12 @@ import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.item.Item; import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.util.Identifier; public class ModRecipeProvider extends FabricRecipeProvider { public ModRecipeProvider(FabricDataOutput output, @@ -25,6 +32,8 @@ public ModRecipeProvider(FabricDataOutput output, public void generate(RecipeExporter exporter) { generateSlab(exporter); generateVerticalSlab(exporter); + generateItems(exporter); + generateStoneCutterSlabRecipes(exporter); } private void generateSlab(RecipeExporter exporter) { @@ -192,6 +201,153 @@ private void generateVerticalSlab(RecipeExporter exporter) { addShapedPressurePlateRecipe(exporter, ModBlocks.QUARTZ_PRESSURE_PLATE, Blocks.QUARTZ_BLOCK); } + private void generateItems(RecipeExporter exporter) { + exporter.accept(Identifier.of(Vanillaplusplus.MOD_ID, "dynamite"), new DynamiteRecipe(CraftingRecipeCategory.MISC), null); + + addShapedDaggerWoodRecipe(exporter, ModItems.WOODEN_DAGGER); + addShapedDaggerStoneRecipe(exporter, ModItems.STONE_DAGGER); + addShapedDaggerRecipe(exporter, ModItems.IRON_DAGGER, Items.IRON_INGOT); + addShapedDaggerRecipe(exporter, ModItems.GOLDEN_DAGGER, Items.GOLD_INGOT); + addShapedDaggerRecipe(exporter, ModItems.DIAMOND_DAGGER, Items.DIAMOND); + offerNetheriteUpgradeRecipe(exporter, ModItems.DIAMOND_DAGGER, RecipeCategory.COMBAT, ModItems.NETHERITE_DAGGER); + + + addShapedHammerWoodRecipe(exporter, ModItems.WOODEN_HAMMER); + addShapedHammerStoneRecipe(exporter, ModItems.STONE_HAMMER); + addShapedHammerRecipe(exporter, ModItems.IRON_HAMMER, Items.IRON_INGOT); + addShapedHammerRecipe(exporter, ModItems.GOLDEN_HAMMER, Items.GOLD_INGOT); + addShapedHammerRecipe(exporter, ModItems.DIAMOND_HAMMER, Items.DIAMOND); + offerNetheriteUpgradeRecipe(exporter, ModItems.DIAMOND_HAMMER, RecipeCategory.TOOLS, ModItems.NETHERITE_HAMMER); + } + + private void generateStoneCutterSlabRecipes(RecipeExporter exporter) { + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.STONE_VERTICAL_SLAB, Blocks.STONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.STONE_BRICK_VERTICAL_SLAB, Blocks.STONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.COBBLESTONE_VERTICAL_SLAB, Blocks.COBBLESTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.MOSSY_COBBLESTONE_VERTICAL_SLAB, Blocks.MOSSY_COBBLESTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.SMOOTH_STONE_VERTICAL_SLAB, Blocks.SMOOTH_STONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.STONE_BRICK_VERTICAL_SLAB, Blocks.STONE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.MOSSY_STONE_BRICK_VERTICAL_SLAB, Blocks.MOSSY_STONE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.GRANITE_VERTICAL_SLAB, Blocks.GRANITE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_GRANITE_VERTICAL_SLAB, Blocks.GRANITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_GRANITE_VERTICAL_SLAB, Blocks.POLISHED_GRANITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DIORITE_VERTICAL_SLAB, Blocks.DIORITE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_DIORITE_VERTICAL_SLAB, Blocks.DIORITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_DIORITE_VERTICAL_SLAB, Blocks.POLISHED_DIORITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.ANDESITE_VERTICAL_SLAB, Blocks.ANDESITE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_ANDESITE_VERTICAL_SLAB, Blocks.ANDESITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_ANDESITE_VERTICAL_SLAB, Blocks.POLISHED_ANDESITE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.COBBLED_DEEPSLATE_VERTICAL_SLAB, Blocks.COBBLED_DEEPSLATE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_BRICK_VERTICAL_SLAB, Blocks.COBBLED_DEEPSLATE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_TILE_VERTICAL_SLAB, Blocks.COBBLED_DEEPSLATE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_DEEPSLATE_VERTICAL_SLAB, Blocks.COBBLED_DEEPSLATE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_DEEPSLATE_VERTICAL_SLAB, Blocks.POLISHED_DEEPSLATE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_BRICK_VERTICAL_SLAB, Blocks.POLISHED_DEEPSLATE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_TILE_VERTICAL_SLAB, Blocks.POLISHED_DEEPSLATE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_BRICK_VERTICAL_SLAB, Blocks.DEEPSLATE_BRICKS, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_TILE_VERTICAL_SLAB, Blocks.DEEPSLATE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DEEPSLATE_TILE_VERTICAL_SLAB, Blocks.DEEPSLATE_TILES, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.TUFF_VERTICAL_SLAB, Blocks.TUFF, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_TUFF_VERTICAL_SLAB, Blocks.TUFF, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.TUFF_BRICK_VERTICAL_SLAB, Blocks.TUFF, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_TUFF_VERTICAL_SLAB, Blocks.POLISHED_TUFF, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.TUFF_BRICK_VERTICAL_SLAB, Blocks.POLISHED_TUFF, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.TUFF_BRICK_VERTICAL_SLAB, Blocks.TUFF_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.BRICK_VERTICAL_SLAB, Blocks.BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.MUD_BRICK_VERTICAL_SLAB, Blocks.MUD_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.SANDSTONE_VERTICAL_SLAB, Blocks.SANDSTONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_SANDSTONE_VERTICAL_SLAB, Blocks.SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_SANDSTONE_VERTICAL_SLAB, Blocks.CUT_SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.SMOOTH_SANDSTONE_VERTICAL_SLAB, Blocks.SMOOTH_SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.RED_SANDSTONE_VERTICAL_SLAB, Blocks.RED_SANDSTONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_RED_SANDSTONE_VERTICAL_SLAB, Blocks.RED_SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_RED_SANDSTONE_VERTICAL_SLAB, Blocks.CUT_RED_SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.SMOOTH_RED_SANDSTONE_VERTICAL_SLAB, Blocks.SMOOTH_RED_SANDSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.PRISMARINE_VERTICAL_SLAB, Blocks.PRISMARINE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.PRISMARINE_BRICK_VERTICAL_SLAB, Blocks.PRISMARINE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.DARK_PRISMARINE_VERTICAL_SLAB, Blocks.DARK_PRISMARINE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.NETHER_BRICK_VERTICAL_SLAB, Blocks.NETHER_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.RED_NETHER_BRICK_VERTICAL_SLAB, Blocks.RED_NETHER_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.BLACKSTONE_VERTICAL_SLAB, Blocks.BLACKSTONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_BLACKSTONE_VERTICAL_SLAB, Blocks.BLACKSTONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_BLACKSTONE_BRICK_VERTICAL_SLAB, Blocks.BLACKSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_BLACKSTONE_VERTICAL_SLAB, Blocks.POLISHED_BLACKSTONE, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_BLACKSTONE_BRICK_VERTICAL_SLAB, Blocks.POLISHED_BLACKSTONE, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.POLISHED_BLACKSTONE_BRICK_VERTICAL_SLAB, Blocks.POLISHED_BLACKSTONE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.END_STONE_BRICK_VERTICAL_SLAB, Blocks.END_STONE_BRICKS, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.PURPUR_VERTICAL_SLAB, Blocks.PURPUR_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.QUARTZ_VERTICAL_SLAB, Blocks.QUARTZ_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.SMOOTH_QUARTZ_VERTICAL_SLAB, Blocks.QUARTZ_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_COPPER_VERTICAL_SLAB, Blocks.CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.CUT_COPPER_VERTICAL_SLAB, Blocks.COPPER_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.EXPOSED_CUT_COPPER_VERTICAL_SLAB, Blocks.EXPOSED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.EXPOSED_CUT_COPPER_VERTICAL_SLAB, Blocks.COPPER_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WEATHERED_CUT_COPPER_VERTICAL_SLAB, Blocks.WEATHERED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WEATHERED_CUT_COPPER_VERTICAL_SLAB, Blocks.WEATHERED_COPPER, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.OXIDIZED_CUT_COPPER_VERTICAL_SLAB, Blocks.OXIDIZED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.OXIDIZED_CUT_COPPER_VERTICAL_SLAB, Blocks.OXIDIZED_COPPER, 2); + + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_COPPER_BLOCK, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_EXPOSED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_EXPOSED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_EXPOSED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_EXPOSED_COPPER, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_WEATHERED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_WEATHERED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_WEATHERED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_WEATHERED_COPPER, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_OXIDIZED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_OXIDIZED_CUT_COPPER, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.WAXED_OXIDIZED_CUT_COPPER_VERTICAL_SLAB, Blocks.WAXED_OXIDIZED_COPPER, 2); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.LAPIS_SLAB, Blocks.LAPIS_BLOCK, 2); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, ModBlocks.LAPIS_VERTICAL_SLAB, Blocks.LAPIS_BLOCK, 2); + + // Diamond, Emerald, Gold and Iron are too hard for a stonecutter! + } + private void offerShapedSlabRecipe(RecipeExporter exporter, RecipeCategory category, Block slab, Block block, String group) { ShapedRecipeJsonBuilder.create(category, slab, 6) @@ -250,4 +406,76 @@ private void addShapedPressurePlateRecipe(RecipeExporter exporter, Block pressur FabricRecipeProvider.conditionsFromItem(block)) .offerTo(exporter); } + + private void addShapedDaggerWoodRecipe(RecipeExporter exporter, Item dagger) { + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger, 1) + .pattern("O") + .pattern("S") + .group("dagger") + .input('O', Ingredient.fromTag(ItemTags.PLANKS)) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } + + private void addShapedDaggerStoneRecipe(RecipeExporter exporter, Item dagger) { + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger, 1) + .pattern("O") + .pattern("S") + .group("dagger") + .input('O', Ingredient.fromTag(ItemTags.STONE_TOOL_MATERIALS)) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } + + private void addShapedDaggerRecipe(RecipeExporter exporter, Item dagger, Item material) { + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger, 1) + .pattern("O") + .pattern("S") + .group("dagger") + .input('O', material) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } + + private void addShapedHammerWoodRecipe(RecipeExporter exporter, Item hammer) { + ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, hammer, 1) + .pattern("OOO") + .pattern(" S ") + .group("hammer") + .input('O', Ingredient.fromTag(ItemTags.PLANKS)) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } + + private void addShapedHammerStoneRecipe(RecipeExporter exporter, Item hammer) { + ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, hammer, 1) + .pattern("OOO") + .pattern(" S ") + .group("hammer") + .input('O', Ingredient.fromTag(ItemTags.STONE_TOOL_MATERIALS)) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } + + private void addShapedHammerRecipe(RecipeExporter exporter, Item hammer, Item material) { + ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, hammer, 1) + .pattern("OOO") + .pattern(" S ") + .group("hammer") + .input('O', material) + .input('S', Items.STICK) + .criterion(FabricRecipeProvider.hasItem(Items.STICK), + FabricRecipeProvider.conditionsFromItem(Items.STICK)) + .offerTo(exporter); + } } diff --git a/src/main/java/com/kayhennig/vanplusplus/entity/ModEntityType.java b/src/main/java/com/kayhennig/vanplusplus/entity/ModEntityType.java new file mode 100644 index 0000000..11f223e --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/entity/ModEntityType.java @@ -0,0 +1,48 @@ +package com.kayhennig.vanplusplus.entity; + +import com.kayhennig.vanplusplus.ModBlocks; +import com.kayhennig.vanplusplus.Vanillaplusplus; +import com.kayhennig.vanplusplus.block.ShelfBlockEntity; +import com.kayhennig.vanplusplus.thrown.DynamiteEntity; + +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ModEntityType { + public static final BlockEntityType SHELF = register("shelf", + BlockEntityType.Builder.create(ShelfBlockEntity::new, + ModBlocks.OAK_SHELF, + ModBlocks.SPRUCE_SHELF, + ModBlocks.BIRCH_SHELF, + ModBlocks.JUNGLE_SHELF, + ModBlocks.ACACIA_SHELF, + ModBlocks.DARK_OAK_SHELF, + ModBlocks.MANGROVE_SHELF, + ModBlocks.CHERRY_SHELF, + ModBlocks.CRIMSON_SHELF, + ModBlocks.WARPED_SHELF + ).build()); + + public static final EntityType DYNAMITE = register("dynamite", + EntityType.Builder.create(DynamiteEntity::new, SpawnGroup.MISC) + .dimensions(0.3f, 0.4f) + .maxTrackingRange(4) + .trackingTickInterval(10) + .build()); + + public static > T register(String path, T blockEntityType) { + return Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(Vanillaplusplus.MOD_ID, path), blockEntityType); + } + + public static > T register(String path, T entityType) { + return Registry.register(Registries.ENTITY_TYPE, Identifier.of(Vanillaplusplus.MOD_ID, path), entityType); + } + + public static void initialize() { + + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/item/DaggerItem.java b/src/main/java/com/kayhennig/vanplusplus/item/DaggerItem.java new file mode 100644 index 0000000..78d14a3 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/item/DaggerItem.java @@ -0,0 +1,66 @@ +package com.kayhennig.vanplusplus.item; + +import java.util.List; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.AttributeModifierSlot; +import net.minecraft.component.type.AttributeModifiersComponent; +import net.minecraft.component.type.ToolComponent; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class DaggerItem extends ToolItem { + public DaggerItem(ToolMaterial toolMaterial, Item.Settings settings) { + super(toolMaterial, settings.component(DataComponentTypes.TOOL, createToolComponent())); + } + + private static ToolComponent createToolComponent() { + return new ToolComponent( + List.of(ToolComponent.Rule.ofAlwaysDropping(List.of(Blocks.COBWEB), 15.0F), ToolComponent.Rule.of(BlockTags.SWORD_EFFICIENT, 1.5F)), 1.0F, 2 + ); + } + + public static AttributeModifiersComponent createAttributeModifiers(ToolMaterial material, int baseAttackDamage, float attackSpeed) { + return AttributeModifiersComponent.builder() + .add( + EntityAttributes.GENERIC_ATTACK_DAMAGE, + new EntityAttributeModifier( + BASE_ATTACK_DAMAGE_MODIFIER_ID, (double)((float)baseAttackDamage + material.getAttackDamage()), EntityAttributeModifier.Operation.ADD_VALUE + ), + AttributeModifierSlot.MAINHAND + ) + .add( + EntityAttributes.GENERIC_ATTACK_SPEED, + new EntityAttributeModifier(BASE_ATTACK_SPEED_MODIFIER_ID, (double)attackSpeed, EntityAttributeModifier.Operation.ADD_VALUE), + AttributeModifierSlot.MAINHAND + ) + .build(); + } + + @Override + public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { + return !miner.isCreative(); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return true; + } + + @Override + public void postDamageEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { + stack.damage(1, attacker, EquipmentSlot.MAINHAND); + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/item/DynamiteItem.java b/src/main/java/com/kayhennig/vanplusplus/item/DynamiteItem.java new file mode 100644 index 0000000..211a199 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/item/DynamiteItem.java @@ -0,0 +1,71 @@ +package com.kayhennig.vanplusplus.item; + +import java.util.List; + +import com.kayhennig.vanplusplus.component.ModDataComponentTypes; +import com.kayhennig.vanplusplus.thrown.DynamiteEntity; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.ProjectileEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ProjectileItem; +import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Position; +import net.minecraft.world.World; + +public class DynamiteItem extends Item implements ProjectileItem { + public static final byte[] FUSE_TIMES = new byte[]{1, 2, 4}; + public DynamiteItem(Item.Settings settings) { + super(settings); + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENTITY_SPLASH_POTION_THROW, SoundCategory.PLAYERS, 0.5f, 0.4f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); + + ItemStack itemStack = user.getStackInHand(hand); + if (!world.isClient) { + DynamiteEntity dynamiteEntity = new DynamiteEntity(world, user); + dynamiteEntity.setItem(itemStack); + dynamiteEntity.setVelocity(user, user.getPitch(), user.getYaw(), -20.0f, 1.5f, 1.0f); + world.spawnEntity(dynamiteEntity); + } + + user.incrementStat(Stats.USED.getOrCreateStat(this)); + itemStack.decrementUnlessCreative(1, user); + return TypedActionResult.success(itemStack, world.isClient()); + } + + @Override + public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) { + DynamiteEntity dynamiteEntity = new DynamiteEntity(world, pos.getX(), pos.getY(), pos.getZ()); + dynamiteEntity.setItem(stack); + return dynamiteEntity; + } + + @Override + public ProjectileItem.Settings getProjectileSettings() { + return ProjectileItem.Settings.builder() + .uncertainty(ProjectileItem.Settings.DEFAULT.uncertainty() * 0.5f) + .power(ProjectileItem.Settings.DEFAULT.power() * 1.5f) + .build(); + } + + @Override + public void appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type) { + if (stack.contains(ModDataComponentTypes.FUSE_TIME)) { + byte fuseTime = stack.get(ModDataComponentTypes.FUSE_TIME); + tooltip.add(Text.translatable("item.vanilla-plus-plus.fuse_time", fuseTime).formatted(Formatting.GRAY)); + } + + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/item/HammerItem.java b/src/main/java/com/kayhennig/vanplusplus/item/HammerItem.java new file mode 100644 index 0000000..77c2e94 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/item/HammerItem.java @@ -0,0 +1,57 @@ +package com.kayhennig.vanplusplus.item; + +import java.util.List; + +import net.minecraft.block.Blocks; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.AttributeModifierSlot; +import net.minecraft.component.type.AttributeModifiersComponent; +import net.minecraft.component.type.ToolComponent; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.registry.tag.BlockTags; + +public class HammerItem extends ToolItem { + public HammerItem(ToolMaterial toolMaterial, Item.Settings settings) { + super(toolMaterial, settings.component(DataComponentTypes.TOOL, createToolComponent())); + } + + private static ToolComponent createToolComponent() { + return new ToolComponent( + List.of(ToolComponent.Rule.ofAlwaysDropping(List.of(Blocks.COBWEB), 5.0F), ToolComponent.Rule.of(BlockTags.SWORD_EFFICIENT, 1.2F)), 1.0F, 2 + ); + } + + public static AttributeModifiersComponent createAttributeModifiers(ToolMaterial material, int baseAttackDamage, float attackSpeed) { + return AttributeModifiersComponent.builder() + .add( + EntityAttributes.GENERIC_ATTACK_DAMAGE, + new EntityAttributeModifier( + BASE_ATTACK_DAMAGE_MODIFIER_ID, (double)((float)baseAttackDamage + material.getAttackDamage()), EntityAttributeModifier.Operation.ADD_VALUE + ), + AttributeModifierSlot.MAINHAND + ) + .add( + EntityAttributes.GENERIC_ATTACK_SPEED, + new EntityAttributeModifier(BASE_ATTACK_SPEED_MODIFIER_ID, (double)attackSpeed, EntityAttributeModifier.Operation.ADD_VALUE), + AttributeModifierSlot.MAINHAND + ) + .build(); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return true; + } + + @Override + public void postDamageEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { + stack.damage(1, attacker, EquipmentSlot.MAINHAND); + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/item/ModItemGroups.java b/src/main/java/com/kayhennig/vanplusplus/item/ModItemGroups.java index 941624f..4e61e2b 100644 --- a/src/main/java/com/kayhennig/vanplusplus/item/ModItemGroups.java +++ b/src/main/java/com/kayhennig/vanplusplus/item/ModItemGroups.java @@ -19,7 +19,7 @@ public class ModItemGroups { .displayName(Text.translatable("itemGroup." + Vanillaplusplus.MOD_ID + ".vanplusplus")) .build(); - public static void init() { + public static void initialize() { Registry.register(Registries.ITEM_GROUP, VANPLUSPLUS, CUSTOM_ITEM_GROUP); } } diff --git a/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipe.java b/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipe.java new file mode 100644 index 0000000..189d4aa --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipe.java @@ -0,0 +1,76 @@ +package com.kayhennig.vanplusplus.recipe; + +import com.kayhennig.vanplusplus.ModItems; +import com.kayhennig.vanplusplus.component.ModDataComponentTypes; +import com.kayhennig.vanplusplus.item.DynamiteItem; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; +import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.CraftingRecipeInput; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.world.World; + +public class DynamiteRecipe extends SpecialCraftingRecipe { + + public DynamiteRecipe(CraftingRecipeCategory craftingRecipeCategory) { + super(craftingRecipeCategory); + } + + public boolean matches(CraftingRecipeInput craftingRecipeInput, World world) { + // the recipe requires at least 1 gunpowder, 1 sand and 1 string + int hasGunpowder = 0; + int hasSand = 0; + int hasString = 0; + + for (int i = 0; i < craftingRecipeInput.getSize(); i++) { + ItemStack itemStack = craftingRecipeInput.getStackInSlot(i); + if (!itemStack.isEmpty()) { + if (Ingredient.ofItems(Items.GUNPOWDER).test(itemStack)) { + hasGunpowder++; + } else if (Ingredient.ofItems(Items.SAND).test(itemStack)) { + hasSand++; + } else if (Ingredient.ofItems(Items.STRING).test(itemStack)) { + hasString++; + } + } + } + + return hasGunpowder > 0 && hasGunpowder <= 3 && hasSand == 1 && hasString == 1; + } + + public ItemStack craft(CraftingRecipeInput craftingRecipeInput, RegistryWrapper.WrapperLookup wrapperLookup) { + int i = 0; + + for (int j = 0; j < craftingRecipeInput.getSize(); j++) { + ItemStack itemStack = craftingRecipeInput.getStackInSlot(j); + if (!itemStack.isEmpty()) { + if (Ingredient.ofItems(Items.GUNPOWDER).test(itemStack)) { + i++; + } + } + } + + ItemStack itemStack2 = new ItemStack(ModItems.DYNAMITE, 2); + itemStack2.set(ModDataComponentTypes.FUSE_TIME, DynamiteItem.FUSE_TIMES[i - 1]); + return itemStack2; + } + + @Override + public boolean fits(int width, int height) { + return width * height >= 2; + } + + @Override + public ItemStack getResult(RegistryWrapper.WrapperLookup registriesLookup) { + return new ItemStack(ModItems.DYNAMITE); + } + + @Override + public RecipeSerializer getSerializer() { + return DynamiteRecipeSerializer.INSTANCE; + } +} diff --git a/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipeSerializer.java b/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipeSerializer.java new file mode 100644 index 0000000..10fbf02 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/recipe/DynamiteRecipeSerializer.java @@ -0,0 +1,22 @@ +package com.kayhennig.vanplusplus.recipe; + +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialRecipeSerializer; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +public class DynamiteRecipeSerializer extends SpecialRecipeSerializer { + public static final DynamiteRecipeSerializer INSTANCE = register("dynamite", new DynamiteRecipeSerializer()); + public DynamiteRecipeSerializer() { + super(DynamiteRecipe::new); + } + + static , T extends Recipe> S register(String id, S serializer) { + return Registry.register(Registries.RECIPE_SERIALIZER, id, serializer); + } + + public static void initialize() { + // NO-OP + } +} \ No newline at end of file diff --git a/src/main/java/com/kayhennig/vanplusplus/thrown/DynamiteEntity.java b/src/main/java/com/kayhennig/vanplusplus/thrown/DynamiteEntity.java new file mode 100644 index 0000000..4405db4 --- /dev/null +++ b/src/main/java/com/kayhennig/vanplusplus/thrown/DynamiteEntity.java @@ -0,0 +1,139 @@ +package com.kayhennig.vanplusplus.thrown; + +import com.kayhennig.vanplusplus.ModItems; +import com.kayhennig.vanplusplus.component.ModDataComponentTypes; +import com.kayhennig.vanplusplus.entity.ModEntityType; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.item.Item; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +public class DynamiteEntity extends ThrownItemEntity { + private byte life; + + public DynamiteEntity(EntityType entityType, World world) { + super(entityType, world); + this.life = 0; + } + + public DynamiteEntity(World world, LivingEntity owner) { + super(ModEntityType.DYNAMITE, owner, world); + this.life = 0; + } + + public DynamiteEntity(World world, double x, double y, double z) { + super(ModEntityType.DYNAMITE, x, y, z, world); + this.life = 0; + } + + + @Override + protected Item getDefaultItem() { + return ModItems.DYNAMITE; + } + + @Override + protected double getGravity() { + return 0.1f; + } + + @Override + protected void onBlockHit(BlockHitResult blockHitResult) { + super.onBlockHit(blockHitResult); + } + + @Override + protected void onCollision(HitResult hitResult) { + HitResult.Type type = hitResult.getType(); + if (type == HitResult.Type.ENTITY) { + this.explode(); + } else if (type == HitResult.Type.BLOCK) { + BlockHitResult blockHitResult = (BlockHitResult)hitResult; + Direction side = blockHitResult.getSide(); + switch (side) { + case UP: + case DOWN: + setVelocity(getVelocity().multiply(0.3f, -0.3f, 0.3f)); + break; + case NORTH: + case SOUTH: + setVelocity(getVelocity().multiply(0.3f, 0.3f, -0.3f)); + break; + case EAST: + case WEST: + setVelocity(getVelocity().multiply(-0.3f, 0.3f, 0.3f)); + break; + default: + break; + } + if (getVelocity().length() < 0.1) { + setVelocity(0, 0, 0); + } + } + } + + @Override + protected void onBlockCollision(BlockState state) { + super.onBlockCollision(state); + } + + @Override + protected void onEntityHit(EntityHitResult entityHitResult) { + super.onEntityHit(entityHitResult); + } + + @Override + protected void updateRotation() { + Vec3d vec3d = this.getVelocity(); + if (vec3d.length() < 1.0E-7) { + return; + } + double d = vec3d.horizontalLength(); + this.setPitch(updateRotation(this.prevPitch, (float)(MathHelper.atan2(vec3d.y, d) * 180.0F / (float)Math.PI))); + this.setYaw(updateRotation(this.prevYaw, (float)(MathHelper.atan2(vec3d.x, vec3d.z) * 180.0F / (float)Math.PI))); + } + + @SuppressWarnings("resource") + @Override + public void tick() { + super.tick(); + int fuseTime = this.getStack().get(ModDataComponentTypes.FUSE_TIME); + fuseTime *= 20; + if (this.life >= fuseTime) { + this.explode(); + } + + if (this.getWorld().isClient && this.life % 4 == 0) { + this.getWorld().addParticle( + ParticleTypes.LAVA, + this.getX(), + this.getY() + 0.75f, + this.getZ(), + this.random.nextGaussian() * 0.1, + this.random.nextGaussian() * 0.1, + this.random.nextGaussian() * 0.1 + ); + } + + + this.life++; + } + + @SuppressWarnings("resource") + private void explode() { + if (!this.getWorld().isClient) { + this.getWorld().createExplosion(this, this.getX(), this.getY(), this.getZ(), 2.0f, World.ExplosionSourceType.TNT); + this.kill(); + } + } +} diff --git a/src/main/resources/assets/vanilla-plus-plus/lang/de_de.json b/src/main/resources/assets/vanilla-plus-plus/lang/de_de.json new file mode 100644 index 0000000..085b33f --- /dev/null +++ b/src/main/resources/assets/vanilla-plus-plus/lang/de_de.json @@ -0,0 +1,173 @@ +{ + + "block.vanilla-plus-plus.iron_slab": "Eisenstufe", + "block.vanilla-plus-plus.lapis_slab": "Lapislazulistufe", + "block.vanilla-plus-plus.gold_slab": "Goldsstufe", + "block.vanilla-plus-plus.diamond_slab": "Diamantstufe", + "block.vanilla-plus-plus.emerald_slab": "Smaragdstufe", + "block.vanilla-plus-plus.oak_log_slab": "Eichenstammstufe", + "block.vanilla-plus-plus.spruce_log_slab": "Fichtenstammstufe", + "block.vanilla-plus-plus.birch_log_slab": "Birkenstammsstufe", + "block.vanilla-plus-plus.jungle_log_slab": "Tropenstammstufe", + "block.vanilla-plus-plus.acacia_log_slab": "Akazienstammstufe", + "block.vanilla-plus-plus.dark_oak_log_slab": "Schwarzeichenstammstufe", + "block.vanilla-plus-plus.mangrove_log_slab": "Mangrovenstammstufe", + "block.vanilla-plus-plus.cherry_log_slab": "Kirschstammstufe", + "block.vanilla-plus-plus.crimson_stem_slab": "Karmesinstielstufe", + "block.vanilla-plus-plus.warped_stem_slab": "Wirrstielstufe", + "block.vanilla-plus-plus.stripped_oak_log_slab": "Entrindete Eichenstammstufe", + "block.vanilla-plus-plus.stripped_spruce_log_slab": "Entrindete Fichtenstammstufe", + "block.vanilla-plus-plus.stripped_birch_log_slab": "Entrindete Birkenstammsstufe", + "block.vanilla-plus-plus.stripped_jungle_log_slab": "Entrindete Tropenstammstufe", + "block.vanilla-plus-plus.stripped_acacia_log_slab": "Entrindete Akazienstammstufe", + "block.vanilla-plus-plus.stripped_dark_oak_log_slab": "Entrindete Schwarzeichenstammstufe", + "block.vanilla-plus-plus.stripped_mangrove_log_slab": "Entrindete Mangrovenstammstufe", + "block.vanilla-plus-plus.stripped_cherry_log_slab": "Entrindete Kirschstammstufe", + "block.vanilla-plus-plus.stripped_crimson_stem_slab": "Entrindete Karmesinstielstufe", + "block.vanilla-plus-plus.stripped_warped_stem_slab": "Entrindete Wirrstielstufe", + "block.vanilla-plus-plus.glass_slab": "Glasstufe", + "block.vanilla-plus-plus.iron_vertical_slab": "Vertikale Eisenstufe", + "block.vanilla-plus-plus.lapis_vertical_slab": "Vertikale Lapislazulistufe", + "block.vanilla-plus-plus.gold_vertical_slab": "Vertikale Goldsstufe", + "block.vanilla-plus-plus.diamond_vertical_slab": "Vertikale Diamantstufe", + "block.vanilla-plus-plus.emerald_vertical_slab": "Vertikale Smaragdstufe", + "block.vanilla-plus-plus.oak_log_vertical_slab": "Vertikale Eichenstammstufe", + "block.vanilla-plus-plus.spruce_log_vertical_slab": "Vertikale Fichtenstammstufe", + "block.vanilla-plus-plus.birch_log_vertical_slab": "Vertikale Birkenstammsstufe", + "block.vanilla-plus-plus.jungle_log_vertical_slab": "Vertikale Tropenstammstufe", + "block.vanilla-plus-plus.acacia_log_vertical_slab": "Vertikale Akazienstammstufe", + "block.vanilla-plus-plus.dark_oak_log_vertical_slab": "Vertikale Schwarzeichenstammstufe", + "block.vanilla-plus-plus.mangrove_log_vertical_slab": "Vertikale Mangrovenstammstufe", + "block.vanilla-plus-plus.cherry_log_vertical_slab": "Vertikale Kirschstammstufe", + "block.vanilla-plus-plus.crimson_stem_vertical_slab": "Vertikale Karmesinstielstufe", + "block.vanilla-plus-plus.warped_stem_vertical_slab": "Vertikale Wirrstielstufe", + "block.vanilla-plus-plus.stripped_oak_log_vertical_slab": "Vertikale entrindete Eichenstammstufe", + "block.vanilla-plus-plus.stripped_spruce_log_vertical_slab": "Vertikale entrindete Fichtenstammstufe", + "block.vanilla-plus-plus.stripped_birch_log_vertical_slab": "Vertikale entrindete Birkenstammsstufe", + "block.vanilla-plus-plus.stripped_jungle_log_vertical_slab": "Vertikale entrindete Tropenstammstufe", + "block.vanilla-plus-plus.stripped_acacia_log_vertical_slab": "Vertikale entrindete Akazienstammstufe", + "block.vanilla-plus-plus.stripped_dark_oak_log_vertical_slab": "Vertikale entrindete Schwarzeichenstammstufe", + "block.vanilla-plus-plus.stripped_mangrove_log_vertical_slab": "Vertikale entrindete Mangrovenstammstufe", + "block.vanilla-plus-plus.stripped_cherry_log_vertical_slab": "Vertikale entrindete Kirschstammstufe", + "block.vanilla-plus-plus.stripped_crimson_stem_vertical_slab": "Vertikale entrindete Karmesinstielstufe", + "block.vanilla-plus-plus.stripped_warped_stem_vertical_slab": "Vertikale entrindete Wirrstielstufe", + "block.vanilla-plus-plus.oak_planks_vertical_slab": "Vertikale Eichenholzstufe", + "block.vanilla-plus-plus.spruce_planks_vertical_slab": "Vertikale Fichtenholzstufe", + "block.vanilla-plus-plus.birch_planks_vertical_slab": "Vertikale Birkenholzstufe", + "block.vanilla-plus-plus.jungle_planks_vertical_slab": "Vertikale Tropenholzstufe", + "block.vanilla-plus-plus.acacia_planks_vertical_slab": "Vertikale Akazienholzstufe", + "block.vanilla-plus-plus.dark_oak_planks_vertical_slab": "Vertikale Schwarzeichenholzstufe", + "block.vanilla-plus-plus.mangrove_planks_vertical_slab": "Vertikale Mangrovenholzstufe", + "block.vanilla-plus-plus.cherry_planks_vertical_slab": "Vertikale Kirschholzstufe", + "block.vanilla-plus-plus.crimson_planks_vertical_slab": "Vertikale Karmesinholzstufe", + "block.vanilla-plus-plus.warped_planks_vertical_slab": "Vertikale Wirrholzstufe", + "block.vanilla-plus-plus.glass_vertical_slab": "Vertikale Glasstufe", + "block.vanilla-plus-plus.bamboo_vertical_slab": "Vertikale Bambusstufe", + "block.vanilla-plus-plus.bamboo_mosaic_vertical_slab": "Vertikale Bambusmosaikstufe", + "block.vanilla-plus-plus.cut_copper_vertical_slab": "Vertikale geschnittene Kupferstufe", + "block.vanilla-plus-plus.exposed_cut_copper_vertical_slab": "Angelaufene vertikale geschnittene Kupferstufe", + "block.vanilla-plus-plus.weathered_cut_copper_vertical_slab": "Verwitterte vertikale geschnittene Kupferstufe", + "block.vanilla-plus-plus.oxidized_cut_copper_vertical_slab": "Oxidierte vertikale geschnittene Kupferstufe", + "block.vanilla-plus-plus.waxed_cut_copper_vertical_slab": "Gewachste vertikale geschnittene Kupferstufe", + "block.vanilla-plus-plus.waxed_exposed_cut_copper_vertical_slab": "Gewachste vertikale angelaufene geschnittene Kupferstufe", + "block.vanilla-plus-plus.waxed_weathered_cut_copper_vertical_slab": "Gewachste vertikale verwitterte geschnittene Kupferstufe", + "block.vanilla-plus-plus.waxed_oxidized_cut_copper_vertical_slab": "Gewachste vertikale oxidierte geschnittene Kupferstufe", + "block.vanilla-plus-plus.quartz_vertical_slab": "Vertikale Quarzstufe", + "block.vanilla-plus-plus.smooth_quartz_vertical_slab": "Vertikale glatte Quarzstufe", + "block.vanilla-plus-plus.stone_vertical_slab": "Vertikale Steinstufe", + "block.vanilla-plus-plus.cobblestone_vertical_slab": "Vertikale Bruchsteinstufe", + "block.vanilla-plus-plus.mossy_cobblestone_vertical_slab": "Vertikale bemooste Bruchsteinstufe", + "block.vanilla-plus-plus.smooth_stone_vertical_slab": "Vertikale glatte Steinstufe", + "block.vanilla-plus-plus.stone_brick_vertical_slab": "Vertikale Steinziegelstufe", + "block.vanilla-plus-plus.mossy_stone_brick_vertical_slab": "Vertikale bemooste Steinziegelstufe", + "block.vanilla-plus-plus.granite_vertical_slab": "Vertikale Granitstufe", + "block.vanilla-plus-plus.polished_granite_vertical_slab": "Vertikale polierte Granitstufe", + "block.vanilla-plus-plus.diorite_vertical_slab": "Vertikale Dioritstufe", + "block.vanilla-plus-plus.polished_diorite_vertical_slab": "Vertikale polierte Dioritstufe", + "block.vanilla-plus-plus.andesite_vertical_slab": "Vertikale Andesitstufe", + "block.vanilla-plus-plus.polished_andesite_vertical_slab": "Vertikale polierte Andesitstufe", + "block.vanilla-plus-plus.cobbled_deepslate_vertical_slab": "Vertikale bruchtiefenschieferstufe", + "block.vanilla-plus-plus.polished_deepslate_vertical_slab": "Vertikale polierte Tiefenschieferstufe", + "block.vanilla-plus-plus.deepslate_brick_vertical_slab": "Vertikale Tiefenschieferziegelstufe", + "block.vanilla-plus-plus.deepslate_tile_vertical_slab": "Vertikale Tiefenschieferfliesenstufe", + "block.vanilla-plus-plus.tuff_vertical_slab": "Vertikale Tuffsteinstufe", + "block.vanilla-plus-plus.polished_tuff_vertical_slab": "Vertikale polierte Tuffsteinstufe", + "block.vanilla-plus-plus.tuff_brick_vertical_slab": "Vertikale Tuffsteinziegelstufe", + "block.vanilla-plus-plus.brick_vertical_slab": "Vertikale Ziegelstufe", + "block.vanilla-plus-plus.mud_brick_vertical_slab": "Vertikale Schlammziegelstufe", + "block.vanilla-plus-plus.sandstone_vertical_slab": "Vertikale Sandsteinstufe", + "block.vanilla-plus-plus.smooth_sandstone_vertical_slab": "Vertikale glatte Sandsteinstufe", + "block.vanilla-plus-plus.cut_sandstone_vertical_slab": "Vertikale geschnittene Sandsteinstufe", + "block.vanilla-plus-plus.red_sandstone_vertical_slab": "Vertikale rote Sandsteinstufe", + "block.vanilla-plus-plus.smooth_red_sandstone_vertical_slab": "Vertikale glatte rote Sandsteinstufe", + "block.vanilla-plus-plus.cut_red_sandstone_vertical_slab": "Vertikale geschnittene rote Sandsteinstufe", + "block.vanilla-plus-plus.prismarine_vertical_slab": "Vertikale Prismarinstufe", + "block.vanilla-plus-plus.prismarine_brick_vertical_slab": "Vertikale Prismarinziegelstufe", + "block.vanilla-plus-plus.dark_prismarine_vertical_slab": "Vertikale dunkle Prismarinstufe", + "block.vanilla-plus-plus.nether_brick_vertical_slab": "Vertikale Netherziegelstufe", + "block.vanilla-plus-plus.red_nether_brick_vertical_slab": "Vertikale rote Netherziegelstufe", + "block.vanilla-plus-plus.blackstone_vertical_slab": "Vertikale Schwarzsteinstufe", + "block.vanilla-plus-plus.polished_blackstone_vertical_slab": "Vertikale polierte Schwarzsteinstufe", + "block.vanilla-plus-plus.polished_blackstone_brick_vertical_slab": "Vertikale polierte Schwarzsteinziegelstufe", + "block.vanilla-plus-plus.end_stone_brick_vertical_slab": "Vertikale Endsteinziegelstufe", + "block.vanilla-plus-plus.purpur_vertical_slab": "Vertikale Purpurstufe", + "block.vanilla-plus-plus.glass_horizontal_pane": "Horizontale Glasscheibe", + "block.vanilla-plus-plus.white_stained_glass_horizontal_pane": "Horizontale weiße Glasscheibe", + "block.vanilla-plus-plus.orange_stained_glass_horizontal_pane": "Horizontale orange Glasscheibe", + "block.vanilla-plus-plus.magenta_stained_glass_horizontal_pane": "Horizontale magenta Glasscheibe", + "block.vanilla-plus-plus.light_blue_stained_glass_horizontal_pane": "Horizontale hellblaue Glasscheibe", + "block.vanilla-plus-plus.yellow_stained_glass_horizontal_pane": "Horizontale gelbe Glasscheibe", + "block.vanilla-plus-plus.lime_stained_glass_horizontal_pane": "Horizontale hellgrüne Glasscheibe", + "block.vanilla-plus-plus.pink_stained_glass_horizontal_pane": "Horizontale rosa Glasscheibe", + "block.vanilla-plus-plus.gray_stained_glass_horizontal_pane": "Horizontale graue Glasscheibe", + "block.vanilla-plus-plus.light_gray_stained_glass_horizontal_pane": "Horizontale hellgraue Glasscheibe", + "block.vanilla-plus-plus.cyan_stained_glass_horizontal_pane": "Horizontale türkise Glasscheibe", + "block.vanilla-plus-plus.purple_stained_glass_horizontal_pane": "Horizontale violette Glasscheibe", + "block.vanilla-plus-plus.blue_stained_glass_horizontal_pane": "Horizontale blaue Glasscheibe", + "block.vanilla-plus-plus.brown_stained_glass_horizontal_pane": "Horizontale braune Glasscheibe", + "block.vanilla-plus-plus.green_stained_glass_horizontal_pane": "Horizontale grüne Glasscheibe", + "block.vanilla-plus-plus.red_stained_glass_horizontal_pane": "Horizontale rote Glasscheibe", + "block.vanilla-plus-plus.black_stained_glass_horizontal_pane": "Horizontale schwarze Glasscheibe", + "block.vanilla-plus-plus.oak_shelf": "Eichenregal", + "block.vanilla-plus-plus.spruce_shelf": "Fichtenregal", + "block.vanilla-plus-plus.birch_shelf": "Birkenregal", + "block.vanilla-plus-plus.jungle_shelf": "Tropenregal", + "block.vanilla-plus-plus.acacia_shelf": "Akazienregal", + "block.vanilla-plus-plus.dark_oak_shelf": "Schwarzeichenregal", + "block.vanilla-plus-plus.mangrove_shelf": "Mangrovenregal", + "block.vanilla-plus-plus.cherry_shelf": "Kirschregal", + "block.vanilla-plus-plus.crimson_shelf": "Karmesinregal", + "block.vanilla-plus-plus.warped_shelf": "Wirrregal", + "block.vanilla-plus-plus.cobblestone_pressure_plate": "Bruchsteindruckplatte", + "block.vanilla-plus-plus.mossy_cobblestone_pressure_plate": "Bemooste Bruchsteindruckplatte", + "block.vanilla-plus-plus.smooth_stone_pressure_plate": "Glatte Steindruckplatte", + "block.vanilla-plus-plus.stone_brick_pressure_plate": "Steinziegeldruckplatte", + "block.vanilla-plus-plus.mossy_stone_brick_pressure_plate": "Bemooste Steinziegeldruckplatte", + "block.vanilla-plus-plus.polished_deepslate_pressure_plate": "Polierter Tiefenschieferdruckplatte", + "block.vanilla-plus-plus.deepslate_brick_pressure_plate": "Tiefenschieferziegeldruckplatte", + "block.vanilla-plus-plus.brick_pressure_plate": "Ziegeldruckplatte", + "block.vanilla-plus-plus.mud_brick_pressure_plate": "Schlammziegeldruckplatte", + "block.vanilla-plus-plus.sandstone_pressure_plate": "Sandsteindruckplatte", + "block.vanilla-plus-plus.red_sandstone_pressure_plate": "Rote Sandsteindruckplatte", + "block.vanilla-plus-plus.nether_brick_pressure_plate": "Netherziegeldruckplatte", + "block.vanilla-plus-plus.red_nether_brick_pressure_plate": "Rote Netherziegeldruckplatte", + "block.vanilla-plus-plus.end_stone_brick_pressure_plate": "Endsteinziegeldruckplatte", + "block.vanilla-plus-plus.quartz_pressure_plate": "Quarzdruckplatte", + + "item.vanilla-plus-plus.dynamite": "Dynamit", + "item.vanilla-plus-plus.fuse_time": "Zündzeit: %1$s", + "item.vanilla-plus-plus.wooden_dagger": "Holzdolch", + "item.vanilla-plus-plus.stone_dagger": "Steindolch", + "item.vanilla-plus-plus.iron_dagger": "Eisendolch", + "item.vanilla-plus-plus.golden_dagger": "Golddolch", + "item.vanilla-plus-plus.diamond_dagger": "Diamantdolch", + "item.vanilla-plus-plus.netherite_dagger": "Netheritdolch", + "item.vanilla-plus-plus.wooden_hammer": "Holzhammer", + "item.vanilla-plus-plus.stone_hammer": "Steinhammer", + "item.vanilla-plus-plus.iron_hammer": "Eisenhammer", + "item.vanilla-plus-plus.golden_hammer": "Goldhammer", + "item.vanilla-plus-plus.diamond_hammer": "Diamanthammer", + "item.vanilla-plus-plus.netherite_hammer": "Netherithammer", + + "tag.item.vanilla-plus-plus.hammers": "Hammer" +} \ No newline at end of file diff --git a/src/main/resources/assets/vanilla-plus-plus/lang/en_us.json b/src/main/resources/assets/vanilla-plus-plus/lang/en_us.json index 8cd025d..432bd6d 100644 --- a/src/main/resources/assets/vanilla-plus-plus/lang/en_us.json +++ b/src/main/resources/assets/vanilla-plus-plus/lang/en_us.json @@ -1,4 +1,7 @@ { + + "itemGroup.vanilla-plus-plus.vanplusplus": "Vanilla++", + "block.vanilla-plus-plus.iron_slab": "Iron Slab", "block.vanilla-plus-plus.lapis_slab": "Lapis Slab", "block.vanilla-plus-plus.gold_slab": "Gold Slab", @@ -152,8 +155,21 @@ "block.vanilla-plus-plus.red_nether_brick_pressure_plate": "Red Nether Brick Pressure Plate", "block.vanilla-plus-plus.end_stone_brick_pressure_plate": "End Stone Brick Pressure Plate", "block.vanilla-plus-plus.quartz_pressure_plate": "Quartz Pressure Plate", - "item.vanilla-plus-plus.grapes": "Grapes", - "item.vanilla-plus-plus.cherries": "Cherries", - "itemGroup.vanilla-plus-plus.vanplusplus": "Vanilla++", - "item.vanilla-plus-plus.pear": "Pear" + + "item.vanilla-plus-plus.dynamite": "Dynamite", + "item.vanilla-plus-plus.fuse_time": "Fuse time: %1$s", + "item.vanilla-plus-plus.wooden_dagger": "Wooden Dagger", + "item.vanilla-plus-plus.stone_dagger": "Stone Dagger", + "item.vanilla-plus-plus.iron_dagger": "Iron Dagger", + "item.vanilla-plus-plus.golden_dagger": "Golden Dagger", + "item.vanilla-plus-plus.diamond_dagger": "Diamond Dagger", + "item.vanilla-plus-plus.netherite_dagger": "Netherite Dagger", + "item.vanilla-plus-plus.wooden_hammer": "Wooden Hammer", + "item.vanilla-plus-plus.stone_hammer": "Stone Hammer", + "item.vanilla-plus-plus.iron_hammer": "Iron Hammer", + "item.vanilla-plus-plus.golden_hammer": "Golden Hammer", + "item.vanilla-plus-plus.diamond_hammer": "Diamond Hammer", + "item.vanilla-plus-plus.netherite_hammer": "Netherite Hammer", + + "tag.item.vanilla-plus-plus.hammers": "Hammers" } \ No newline at end of file diff --git a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_east.json b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_east.json index 512fac2..eba479c 100644 --- a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_east.json +++ b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_east.json @@ -12,7 +12,8 @@ "up": { "uv": [0, 0, 8, 16], "texture": "#all" }, "north": { "uv": [0, 8, 8, 10], "texture": "#all", "cullface": "north" }, "south": { "uv": [0, 8, 8, 10], "texture": "#all", "cullface": "south" }, - "east": { "uv": [0, 8, 16, 10], "texture": "#all" } + "east": { "uv": [0, 8, 16, 10], "texture": "#all" }, + "west": { "uv": [0, 8, 16, 10], "texture": "#all", "cullface": "west" } } }, diff --git a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_north.json b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_north.json index 9e594fb..beb4a21 100644 --- a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_north.json +++ b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_north.json @@ -12,7 +12,8 @@ "up": { "uv": [0, 8, 16, 16], "texture": "#all" }, "north": { "uv": [0, 8, 16, 10], "texture": "#all" }, "west": { "uv": [8, 8, 16, 10], "texture": "#all", "cullface": "west" }, - "east": { "uv": [8, 8, 16, 10], "texture": "#all", "cullface": "east" } + "east": { "uv": [8, 8, 16, 10], "texture": "#all", "cullface": "east" }, + "south": { "uv": [0, 8, 16, 10], "texture": "#all", "cullface": "south" } } }, diff --git a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_south.json b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_south.json index 1cd8cdb..2d73d0a 100644 --- a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_south.json +++ b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_south.json @@ -12,7 +12,8 @@ "up": { "uv": [0, 0, 16, 8], "texture": "#all" }, "south": { "uv": [0, 8, 16, 10], "texture": "#all" }, "west": { "uv": [0, 8, 8, 10], "texture": "#all", "cullface": "west" }, - "east": { "uv": [0, 8, 8, 10], "texture": "#all", "cullface": "east" } + "east": { "uv": [0, 8, 8, 10], "texture": "#all", "cullface": "east" }, + "north": { "uv": [0, 8, 16, 10], "texture": "#all", "cullface": "north" } } }, diff --git a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_west.json b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_west.json index 2f0e06e..85a7839 100644 --- a/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_west.json +++ b/src/main/resources/assets/vanilla-plus-plus/models/block/shelf_west.json @@ -12,7 +12,8 @@ "up": { "uv": [8, 0, 16, 16], "texture": "#all" }, "north": { "uv": [8, 8, 16, 10], "texture": "#all", "cullface": "north" }, "south": { "uv": [8, 8, 16, 10], "texture": "#all", "cullface": "south" }, - "west": { "uv": [0, 8, 16, 10], "texture": "#all" } + "west": { "uv": [0, 8, 16, 10], "texture": "#all" }, + "east": { "uv": [0, 8, 16, 10], "texture": "#all", "cullface": "east" } } }, diff --git a/src/main/resources/assets/vanilla-plus-plus/models/item/dynamite.json b/src/main/resources/assets/vanilla-plus-plus/models/item/dynamite.json new file mode 100644 index 0000000..a324eda --- /dev/null +++ b/src/main/resources/assets/vanilla-plus-plus/models/item/dynamite.json @@ -0,0 +1,41 @@ +{ + "textures": { + "all": "vanilla-plus-plus:item/dynamite" + }, + "elements": [ + { + "from": [7, 1, 7], + "to": [10, 11, 10], + "faces": { + "down": { "uv": [0, 9, 3, 12], "texture": "#all" }, + "up": { "uv": [0, 9, 3, 12], "texture": "#all" }, + "north": { "uv": [0, 0, 3, 9], "texture": "#all" }, + "south": { "uv": [0, 0, 3, 9], "texture": "#all" }, + "west": { "uv": [0, 0, 3, 9], "texture": "#all" }, + "east": { "uv": [0, 0, 3, 9], "texture": "#all" } + } + }, + { + "from": [8, 11, 8], + "to": [9, 13, 9], + "faces": { + "up": { "uv": [3, 0, 4, 2], "texture": "#all" }, + "north": { "uv": [3, 0, 4, 2], "texture": "#all" }, + "south": { "uv": [3, 0, 4, 2], "texture": "#all" }, + "west": { "uv": [3, 0, 4, 2], "texture": "#all" }, + "east": { "uv": [3, 0, 4, 2], "texture": "#all" } + } + }, + { + "from": [8, 13, 9], + "to": [9, 14, 10], + "faces": { + "up": { "uv": [3, 2, 4, 3], "texture": "#all" }, + "north": { "uv": [3, 2, 4, 3], "texture": "#all" }, + "south": { "uv": [3, 2, 4, 3], "texture": "#all" }, + "west": { "uv": [3, 2, 4, 3], "texture": "#all" }, + "east": { "uv": [3, 2, 4, 3], "texture": "#all" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_dagger.png new file mode 100644 index 0000000..50d14f9 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_hammer.png new file mode 100644 index 0000000..64a187d Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/diamond_hammer.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/dynamite.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/dynamite.png new file mode 100644 index 0000000..6d7ee10 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/dynamite.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_dagger.png new file mode 100644 index 0000000..446beb3 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_hammer.png new file mode 100644 index 0000000..80c18a8 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/golden_hammer.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_dagger.png new file mode 100644 index 0000000..6aa13f6 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_hammer.png new file mode 100644 index 0000000..9c8c6d9 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/iron_hammer.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_dagger.png new file mode 100644 index 0000000..3c50f27 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_hammer.png new file mode 100644 index 0000000..92e63d6 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/netherite_hammer.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_dagger.png new file mode 100644 index 0000000..e28eb93 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_hammer.png new file mode 100644 index 0000000..1f9de1a Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/stone_hammer.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_dagger.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_dagger.png new file mode 100644 index 0000000..2419365 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_dagger.png differ diff --git a/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_hammer.png b/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_hammer.png new file mode 100644 index 0000000..e4737d3 Binary files /dev/null and b/src/main/resources/assets/vanilla-plus-plus/textures/item/wooden_hammer.png differ