From 519ab29adc54d77c345dedbd35426cdd4429d3a7 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Sun, 30 Mar 2025 13:55:40 +0100 Subject: [PATCH] Fix being unable to block with netherite swords --- .../sources/net/minecraft/world/item/Items.java.patch | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch index e8bc645..2bb0dc0 100644 --- a/sakura-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch +++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/Items.java +++ b/net/minecraft/world/item/Items.java -@@ -1083,27 +_,27 @@ +@@ -1083,33 +_,33 @@ public static final Item GOLD_INGOT = registerItem("gold_ingot"); public static final Item NETHERITE_INGOT = registerItem("netherite_ingot", new Item.Properties().fireResistant()); public static final Item NETHERITE_SCRAP = registerItem("netherite_scrap", new Item.Properties().fireResistant()); @@ -33,6 +33,13 @@ public static final Item DIAMOND_SHOVEL = registerItem("diamond_shovel", properties -> new ShovelItem(ToolMaterial.DIAMOND, 1.5F, -3.0F, properties)); public static final Item DIAMOND_PICKAXE = registerItem("diamond_pickaxe", properties -> new PickaxeItem(ToolMaterial.DIAMOND, 1.0F, -2.8F, properties)); public static final Item DIAMOND_AXE = registerItem("diamond_axe", properties -> new AxeItem(ToolMaterial.DIAMOND, 5.0F, -3.0F, properties)); + public static final Item DIAMOND_HOE = registerItem("diamond_hoe", properties -> new HoeItem(ToolMaterial.DIAMOND, -3.0F, 0.0F, properties)); + public static final Item NETHERITE_SWORD = registerItem( +- "netherite_sword", properties -> new SwordItem(ToolMaterial.NETHERITE, 3.0F, -2.4F, properties), new Item.Properties().fireResistant() ++ "netherite_sword", properties -> new me.samsuik.sakura.player.item.BlockableSwordItem(ToolMaterial.NETHERITE, 3.0F, -2.4F, properties), new Item.Properties().fireResistant() // Sakura - allow blocking with swords + ); + public static final Item NETHERITE_SHOVEL = registerItem( + "netherite_shovel", properties -> new ShovelItem(ToolMaterial.NETHERITE, 1.5F, -3.0F, properties), new Item.Properties().fireResistant() @@ -1194,6 +_,7 @@ public static final Item GOLDEN_APPLE = registerItem("golden_apple", new Item.Properties().food(Foods.GOLDEN_APPLE, Consumables.GOLDEN_APPLE)); public static final Item ENCHANTED_GOLDEN_APPLE = registerItem(