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 0000000..c075459 Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/hammer.png differ