From 143ce70b915c53a6f13e85d28d5f50ecb098f563 Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:47:42 -0700 Subject: [PATCH] hammer --- src/main/java/net/serenas/shitmod/Shitmod.java | 4 ++-- .../java/net/serenas/shitmod/testHammer.java | 6 ++---- .../resources/assets/shitmod/lang/en_us.json | 3 ++- .../assets/shitmod/models/item/hammer.json | 6 ++++++ .../assets/shitmod/textures/item/hammer.png | Bin 0 -> 8508 bytes 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/shitmod/models/item/hammer.json create mode 100644 src/main/resources/assets/shitmod/textures/item/hammer.png diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index df7e4ce..c02a1ee 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -124,7 +124,7 @@ public class Shitmod implements ModInitializer { public static final Enchantment LIFESTEAL = new lifeStealEnchantment(Enchantment.Rarity.RARE, EnchantmentTarget.WEAPON, new EquipmentSlot[] {EquipmentSlot.MAINHAND}); - public static final PickaxeItem HAMMER = new testHammer(ToolMaterials.NETHERITE, 3, 2, new Item.Settings().group(Shitmod.TOOLS_GROUP).fireproof().maxDamage(800)); + public static final PickaxeItem HAMMER = new testHammer(ToolMaterials.NETHERITE, 3, -1, new Item.Settings().group(Shitmod.TOOLS_GROUP).fireproof().maxDamage(2031)); @Override public void onInitialize() { @@ -216,6 +216,6 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ENCHANTMENT, new Identifier("shitmod", "lifesteal"), LIFESTEAL); - Registry.register(Registry.ITEM, new Identifier("shitmod", "Hammer"), HAMMER); + Registry.register(Registry.ITEM, new Identifier("shitmod", "hammer"), HAMMER); } } diff --git a/src/main/java/net/serenas/shitmod/testHammer.java b/src/main/java/net/serenas/shitmod/testHammer.java index 11adf1c..064779c 100644 --- a/src/main/java/net/serenas/shitmod/testHammer.java +++ b/src/main/java/net/serenas/shitmod/testHammer.java @@ -25,8 +25,6 @@ public class testHammer extends PickaxeItem { return true; } ItemStack mainHandStack = player.getMainHandStack(); - - // Taken from Entity#rayTrace Vec3d vec3d_1 = player.getCameraPosVec(1); Vec3d vec3d_2 = player.getRotationVec(1); int range = 4; @@ -41,10 +39,10 @@ public class testHammer extends PickaxeItem { boolean canBreak = newState.getHardness(world, newPos) >= 0 || (!newState.isToolRequired() && mainHandStack.getMiningSpeedMultiplier(newState) > 1); if (!canBreak) continue; - // Let's break the block! world.breakBlock(newPos, true, player); } } return true; -}} + } +} diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index 6f86b47..4e6d8fc 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -45,5 +45,6 @@ "subtitles.shitmod.glock_noise": "Glock Fires", "enchantment.shitmod.lifesteal": "Life Steal", "enchantment.shitmod.explosion_aspect": "Explosion Aspect", - "enchantment.shitmod.explosive_thorns": "Explosive Thorns" + "enchantment.shitmod.explosive_thorns": "Explosive Thorns", + "item.shitmod.hammer": "Hammer" } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/hammer.json b/src/main/resources/assets/shitmod/models/item/hammer.json new file mode 100644 index 0000000..d8b5aac --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/hammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/textures/item/hammer.png b/src/main/resources/assets/shitmod/textures/item/hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..c0754595c7cf91c63d45a57a65ed7f92e099b28e GIT binary patch literal 8508 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