Skip to content

Commit

Permalink
Add blunt harken blade
Browse files Browse the repository at this point in the history
  • Loading branch information
IcarussOne committed Jun 9, 2024
1 parent a15a26e commit 7a1dbd4
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/main/java/mod/emt/harkenscythe/entities/HSSoul.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -39,7 +38,7 @@ public void onEntityUpdate()
{
for (EntityItem entityItem : list)
{
if (!entityItem.isDead && entityItem.getItem().getItem() == Items.IRON_SWORD)
if (!entityItem.isDead && entityItem.getItem().getItem() == HSItems.blunt_harken_blade)
{
this.world.playSound(null, this.getPosition(), HSSoundEvents.ITEM_ATHAME_CREATE, SoundCategory.PLAYERS, 1.0F, 1.5F / (this.world.rand.nextFloat() * 0.4F + 1.2F));
this.world.spawnParticle(EnumParticleTypes.CLOUD, this.posX, this.posY + 1.5D, this.posZ, 0.0D, 0.1D, 0.0D);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class HSItemTooltipEvent
{
private static final ResourceLocation BLOOD_ALTAR = new ResourceLocation(HarkenScythe.MOD_ID, "blood_altar");
private static final ResourceLocation SOUL_ALTAR = new ResourceLocation(HarkenScythe.MOD_ID, "soul_altar");
private static final ResourceLocation BLUNT_HARKEN_BLADE = new ResourceLocation(HarkenScythe.MOD_ID, "blunt_harken_blade");
private static final ResourceLocation HARKEN_ATHAME = new ResourceLocation(HarkenScythe.MOD_ID, "harken_athame");

@SubscribeEvent
Expand All @@ -31,5 +32,9 @@ else if (ForgeRegistries.ITEMS.getKey(item).equals(HARKEN_ATHAME))
{
event.getToolTip().add(1, I18n.format("tooltip.harkenscythe.athame"));
}
else if (ForgeRegistries.ITEMS.getKey(item).equals(BLUNT_HARKEN_BLADE))
{
event.getToolTip().add(1, I18n.format("tooltip.harkenscythe.blunt_blade"));
}
}
}
5 changes: 4 additions & 1 deletion src/main/java/mod/emt/harkenscythe/init/HSItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ public class HSItems
@GameRegistry.ObjectHolder("livingmetal_boots")
public static HSArmor livingmetal_boots;

@GameRegistry.ObjectHolder("blunt_harken_blade")
public static HSItem blunt_harken_blade;
@GameRegistry.ObjectHolder("harken_athame")
public static HSSword harken_athame;

Expand Down Expand Up @@ -209,7 +211,8 @@ public static void onRegisterItemsEvent(@Nonnull final RegistryEvent.Register<It
HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.CHEST, EnumRarity.UNCOMMON), "livingmetal_chestplate").setCreativeTab(HarkenScythe.TAB),
HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.LEGS, EnumRarity.UNCOMMON), "livingmetal_leggings").setCreativeTab(HarkenScythe.TAB),
HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.FEET, EnumRarity.UNCOMMON), "livingmetal_boots").setCreativeTab(HarkenScythe.TAB),
HSRegistry.setup(new HSSword(ToolMaterial.IRON, EnumRarity.UNCOMMON), "harken_athame").setCreativeTab(HarkenScythe.TAB)
HSRegistry.setup(new HSItem(EnumRarity.COMMON), "blunt_harken_blade").setCreativeTab(HarkenScythe.TAB),
HSRegistry.setup(new HSSword(ToolMaterial.IRON, EnumRarity.COMMON), "harken_athame").setCreativeTab(HarkenScythe.TAB)
);

// ITEM BLOCKS
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/harkenscythe/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ item.harkenscythe.biomass_seed.name=Biomass Seed
item.harkenscythe.biomass_shovel.name=Biomass Shovel
item.harkenscythe.biomass_sword.name=Biomass Sword
item.harkenscythe.blood_essence.name=Bloody Essence
item.harkenscythe.blunt_harken_blade.name=Blunt Harken Blade
item.harkenscythe.carnage_book.name=Book of Carnage
item.harkenscythe.creepball.name=Creepball
item.harkenscythe.diamond_glaive.name=Diamond Glaive
Expand Down Expand Up @@ -64,3 +65,4 @@ message.harkenscythe.hs_reap=%s was reaped
# TOOLTIPS
tooltip.harkenscythe.altar=Requires a Harken Athame for rituals
tooltip.harkenscythe.athame=An Iron Sword could develop magical abilities if it comes into contact with blood or souls...
tooltip.harkenscythe.blunt_blade=It could develop magical abilities if it comes into contact with blood or souls...
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "harkenscythe:items/blunt_harken_blade"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "item/handheld",
"textures": {
"layer0": "harkenscythe:items/harken_athame"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "forge:ore_shapeless",
"ingredients": [
{
"type": "forge:ore_dict",
"ore": "stickWood"
},
{
"type": "forge:ore_dict",
"ore": "ingotIron"
},
{
"type": "forge:ore_dict",
"ore": "bone"
}
],
"result": {
"item": "harkenscythe:blunt_harken_blade"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a1dbd4

Please sign in to comment.